center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity
4,865 Commits 1 Branch 86 Tags 417 MiB
d3e8fd2da7
Commit Graph

2628 Commits

Author SHA1 Message Date
taojinlong
b4a42d7545 Merge branch 'v1.8' of github.com:dataease/dataease into v1.8 2022-03-02 16:09:25 +08:00
taojinlong
a40cd1e08a fix: 创建关联数据集可选择[API]数据集 2022-03-02 16:09:09 +08:00
junjun
7d69d3da92 refactor: 折线图标签优化 2022-03-02 15:41:56 +08:00
junjun
62cb866a35 refactor: 折线图标签优化 2022-03-02 15:40:57 +08:00
junjun
75b2b77a40 refactor: 视图编辑增加关闭按钮 2022-03-02 15:04:25 +08:00
junjun
9ceb19d70e refactor: 视图编辑增加关闭按钮 2022-03-02 14:58:19 +08:00
王嘉豪
3b15ef587d
Merge pull request #1869 from dataease/v1.8 
V1.8
 2022-03-02 14:12:53 +08:00
wangjiahao
539b4a93c6 style: 编辑页面跳转滚动条宽度 2022-03-02 14:11:17 +08:00
fit2cloud-chenyw
5c008256db fix: 公共链接视图api缺少参数 2022-03-02 11:25:37 +08:00
fit2cloud-chenyw
930a0288d0 fix: 公共链接视图api缺少参数 2022-03-02 11:23:25 +08:00
王嘉豪
45767f75e4
Merge pull request #1863 from dataease/v1.8 
V1.8
 2022-03-02 10:53:53 +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
c380781c3b refactor: 分享列表仪表板使用代理权限查看 2022-03-01 21:02:40 +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
fdddaa8472 feat: 设置 mongo 默认链接参数 2022-03-01 18:16:39 +08:00
王嘉豪
f951ac0405
Merge pull request #1860 from dataease/v1.8 
V1.8
 2022-03-01 16:54:45 +08:00
wangjiahao
feec812267 Merge remote-tracking branch 'origin/v1.8' into v1.8 2022-03-01 16:53:43 +08:00
wangjiahao
2b41447a1b fix: 修复边框选不上的问题 2022-03-01 16:51:38 +08:00
taojinlong
b06dfd09bc Merge branch 'v1.8' into dev 2022-03-01 16:50:41 +08:00
taojinlong
7f3913420d Merge branch 'v1.8' of github.com:dataease/dataease into v1.8 2022-03-01 16:48:09 +08:00
taojinlong
84070f355a fxi: api 权限错误 2022-03-01 16:47:56 +08:00
王嘉豪
f4f80d0b38
Merge branch 'dev' into v1.8 2022-03-01 16:20:38 +08:00
wangjiahao
d9d96f01af Merge remote-tracking branch 'origin/v1.8' into v1.8 2022-03-01 16:16:22 +08:00
wangjiahao
d25e764fda fix: 修复边框选不上的问题 2022-03-01 16:16:09 +08:00
fit2cloud-chenyw
25a1badbd0 refactor: 用户列表与仪表板分享用户接口分离 2022-03-01 15:12:24 +08:00
fit2cloud-chenyw
df60372245
Merge pull request #1858 from dataease/pr@v1.8@refactor_user_grid_api_stage 
refactor: 用户列表与仪表板分享用户接口分离
 2022-03-01 15:11:22 +08:00
fit2cloud-chenyw
9e625e21bd refactor: 用户列表与仪表板分享用户接口分离 2022-03-01 15:09:47 +08:00
王嘉豪
79d0fd2397
Merge pull request #1857 from dataease/v1.8 
V1.8
 2022-03-01 14:50:25 +08:00
wangjiahao
6ef1163210 Merge remote-tracking branch 'origin/v1.8' into v1.8 2022-03-01 14:46:55 +08:00
wangjiahao
50ba73d7ad fix: 时钟样式改变保存按钮未高亮问题 2022-03-01 14:46:18 +08:00
taojinlong
b1da1d8bf0 Merge branch 'v1.8' into dev 2022-03-01 12:43:45 +08:00
taojinlong
780536c2f2 fix: 数据集权限 2022-03-01 12:43:07 +08:00
wangjiahao
f7a6051841 refactor: 优化视图跳转设置弹框样式 2022-03-01 12:04:03 +08:00
王嘉豪
5193d5f125
Merge pull request #1852 from dataease/v1.8 
V1.8
 2022-03-01 11:16:07 +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
junjun
468a2ed194 refactor: 视图字段增加校验提示 2022-03-01 10:56:01 +08:00
junjun
c3f608ee63 refactor: 视图字段增加校验提示 2022-03-01 10:50:54 +08:00
taojinlong
b9bbbe1907 Merge branch 'v1.8' into dev 2022-02-28 23:02:04 +08:00
taojinlong
af7b9dab09 fix: 识别 pg 类型 2022-02-28 23:01:29 +08:00
taojinlong
4d0319d44c Merge branch 'v1.8' of github.com:dataease/dataease into v1.8 2022-02-28 21:57:45 +08:00
王嘉豪
ffa6f34931
Merge pull request #1849 from dataease/v1.8 
refactor: 编辑完视图返回时记录一次仪表板镜像
 2022-02-28 18:49:01 +08:00
taojinlong
59e5aadee6 fix: mongo 拉取不到最新的collection 2022-02-28 18:45:59 +08:00
wangjiahao
a9b938c1b4 refactor: 编辑完视图返回时记录一次仪表板镜像 2022-02-28 18:37:22 +08:00
王嘉豪
4828f7d25e
Merge pull request #1848 from dataease/v1.8 
V1.8
 2022-02-28 18:30:58 +08:00
wangjiahao
fdf1e9ab60 refactor: S2表格去掉自有的padding 2022-02-28 18:29:24 +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
fit2cloud-chenyw
0f22f367ac fix: 使用未同步数据集创建视图权限问题 2022-02-28 16:57:39 +08:00
fit2cloud-chenyw
1896875fcb fix: 使用未同步数据集创建视图权限问题 2022-02-28 16:55:35 +08:00
taojinlong
84e65cb659 Merge branch 'v1.8' of github.com:dataease/dataease into v1.8 2022-02-28 15:02:45 +08:00
王嘉豪
c5cf1bb199
Merge pull request #1845 from dataease/v1.8 
V1.8
 2022-02-28 12:16:38 +08:00
wangjiahao
9585dc5c9d fix: 气泡地图间隙太大问题 2022-02-28 12:14:49 +08:00
王嘉豪
762df101c0
Merge pull request #1842 from dataease/v1.8 
V1.8
 2022-02-28 11:41:25 +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
5e794da1f5 Merge remote-tracking branch 'origin/v1.8' into v1.8 2022-02-28 11:36:02 +08:00
wangjiahao
7aaad18dd9 fix: 自己创建的仪表板右上角没有编辑按钮 2022-02-28 11:35:32 +08:00
junjun
f8f3b312ee refactor: 删除无用接口 2022-02-28 11:24:25 +08:00
junjun
64d9471c33 refactor: 删除无用接口 2022-02-28 11:22:30 +08:00
junjun
5141f52abb refactor: 视图权限 2022-02-28 11:19:32 +08:00
junjun
3e03239941 refactor: 视图权限 2022-02-28 11:17:26 +08:00
wangjiahao
a0893ae0e0 Merge remote-tracking branch 'origin/v1.8' into v1.8 2022-02-28 11:16:22 +08:00
wangjiahao
6c5d080c0a fix: 汇总表联动错误问题 2022-02-28 11:15:04 +08:00
fit2cloud-chenyw
ea8fe4b44f fix: tab新增失败 2022-02-28 11:05:10 +08:00
junjun
37f24b7bfc refactor: 数据集视图权限 2022-02-27 14:52:25 +08:00
junjun
9642862e57 refactor: 数据集视图权限 2022-02-27 14:49:59 +08:00
taojinlong
9ac2f35992 Merge branch 'v1.8' of github.com:dataease/dataease into v1.8 2022-02-26 17:08:45 +08:00
taojinlong
afa4b4ed32 fix: 数据源、数据集 api 权限 2022-02-26 17:08:37 +08:00
taojinlong
4eb5d29bed Merge branch 'dev' of github.com:dataease/dataease into dev 2022-02-26 17:07:18 +08:00
taojinlong
4f2fe49bea fix: 数据源、数据集 api 权限 2022-02-26 17:06:15 +08:00
junjun
1e407b49bb refactor: 去除堆叠柱状图柱间隔选项 2022-02-25 18:29:40 +08:00
junjun
3d458316a9 refactor: 去除堆叠柱状图柱间隔选项 2022-02-25 18:28:49 +08:00
taojinlong
48eec58796 fix: api 数据源有时修改名称弹出二次确认 2022-02-25 17:56:30 +08:00
wangjiahao
bc0962f27b refactor: 增加svg边框自适应大小属性 2022-02-25 12:17:33 +08:00
fit2cloudrd
a369c712b5
chore: 更新版本号 2022-02-25 09:51:29 +08:00
wangjiahao
7c97035f71 refactor: 更新可选边框 2022-02-24 22:19:49 +08:00
wangjiahao
b6cc7fca7d Merge remote-tracking branch 'origin/dev' into dev 2022-02-24 18:14:47 +08:00
wangjiahao
c32fce753d fix: 历史仪表板的公共链接打不开的问题 2022-02-24 18:14:32 +08:00
fit2cloud-chenyw
1072f14204 fix: tabs初始化条件报错 2022-02-24 18:11:49 +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
5e695b3b81 refactor: 漏斗图样式优化 2022-02-24 16:42:31 +08:00
fit2cloud-chenyw
c3e257d411 fix: 时间动态组件鼠标悬浮自增长 2022-02-24 13:29:11 +08:00
fit2cloud-chenyw
0a63bf4e88 fix: tabs组件中的视图全屏预览错误 2022-02-24 12:33:37 +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
fit2cloud-chenyw
af2f2d85c9
Merge pull request #1815 from dataease/pr@dev@fix_buddle_map_zoom 
fix: 气泡地图放大无法显示
 2022-02-23 18:26:25 +08:00
fit2cloud-chenyw
a5c93490e9 fix: 气泡地图放大无法显示 2022-02-23 18:25:04 +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
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
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