github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-27 13:52:53 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
5,463 Commits 33 Branches 90 Tags 430 MiB
539a8993b5
Commit Graph

2123 Commits

Author SHA1 Message Date
fit2cloud-chenyw
82527be0be
Merge pull request #1988 from dataease/pr@dev@feat_layout_storage 
feat: 浏览器记录页面分割线位置
 2022-03-29 11:48:00 +08:00
fit2cloud-chenyw
827d0823aa feat: 浏览器记录页面分割线位置 2022-03-29 11:46:48 +08:00
wangjiahao
ef1affe9f1 refactor: 优化公共链接第三方参数 2022-03-29 11:32:59 +08:00
wangjiahao
3348742314 fix: 修改标题不实时显示问题 2022-03-28 21:41:01 +08:00
wangjiahao
4d6e35fb25 fix: 修改标题不实时显示问题 2022-03-28 21:38:21 +08:00
fit2cloudrd
d3e8fd2da7
feat: 组件背景统一到仪表板层面设置 
Co-authored-by: wangjiahao <1522128093@qq.com>
 2022-03-28 21:18:56 +08:00
taojinlong
879890fe54 feat: 加密公共链接中的用户ID 2022-03-28 17:01:03 +08:00
taojinlong
fc1a92d04e fix: 增加接口校验 2022-03-28 15:23:22 +08:00
taojinlong
252f88bbba Merge branch 'dev' of github.com:dataease/dataease into dev 2022-03-28 11:40:42 +08:00
taojinlong
42ec51f02d fix: 字符串转时间格式错误 2022-03-28 11:40:25 +08:00
王嘉豪
c34a9b127c
Merge pull request #1973 from dataease/pr@dev@feat_panel-jump 
feat: 仪表板点击视图跳转外部链接是可以加上点击参数
 2022-03-28 09:20:11 +08:00
wangjiahao
59b5b0a0cf feat: 仪表板点击视图跳转外部链接是可以加上点击参数 2022-03-28 09:19:18 +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
wangjiahao
44e7cd5dfb feat: 仪表板增加Web组件 2022-03-27 19:06:37 +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
71557bfe8f Merge branch 'dev' into pr@dev@cluster 2022-03-25 17:00:52 +08:00
taojinlong
e2d088a51f feat: 支持集群（kettle） 2022-03-25 16:59:22 +08:00
fit2cloud-chenyw
9c967cf1db fix: 增加公共链接密码强度 2022-03-23 15:01:40 +08:00
fit2cloud-chenyw
c1d9387578 fix: 去除前端debugger 2022-03-23 14:26:51 +08:00
taojinlong
a045f51515 feat: 支持集群（doris） 2022-03-22 19:33:19 +08:00
fit2cloud-chenyw
b96f7be842 fix: oidc使用de账号登录成功 2022-03-22 18:16:23 +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
3749e9c0d4 fix: 移动端查看分享仪表板报错 2022-03-22 15:20:26 +08:00
fit2cloud-chenyw
ccba5bdce5 refactor: 重构系统参数-显示设置布局 2022-03-22 12:56:42 +08:00
fit2cloud-chenyw
c42931e5cf
Merge pull request #1942 from dataease/pr@dev@fix_plugin_view_switch 
fix: 视图插件切换别的视图报错
 2022-03-21 14:10:04 +08:00
fit2cloud-chenyw
7d5452b64b fix: 视图插件切换别的视图报错 2022-03-21 14:06:46 +08:00
junjun
2ed3c6e80c refactor: 视图编辑块优化 2022-03-21 10:40:45 +08:00
wangjiahao
bed5a0bf02 refactor: 优化外部参数设置界面 2022-03-18 20:35:52 +08:00
taojinlong
4a0d2ffbcf Merge branch 'dev' of github.com:dataease/dataease into dev 2022-03-18 11:53:53 +08:00
taojinlong
689a6461a9 fix: 显示数据源名称 2022-03-18 11:53:45 +08:00
junjun
f14df08bda refactor: 视图编辑块样式优化 2022-03-18 11:12:52 +08:00
wangjiahao
05003e5fa3 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-03-17 21:42:15 +08:00
wangjiahao
89652ad890 feat: 仪表板支持接收外部参数 2022-03-17 21:14:19 +08:00
junjun
f3d32a6e9d feat: 文本卡 2022-03-17 11:40:23 +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
196f1f6891 fix: 模板导入失败问题 2022-03-16 21:09:29 +08:00
wangjiahao
3f48d8ad24 feat: 拥有移动端布局的仪表板在列表中增加标志 2022-03-16 20:44:54 +08:00
wangjiahao
343a386955 feat: 模板新建仪表板可以更换数据集，未更换显示模板视图数据，并提示 2022-03-16 18:09:16 +08:00
junjun
ca6ad712c1 refactor: 视图编辑块显示问题 2022-03-16 11:17:31 +08:00
wangjiahao
2ca5f9bcec refactor: 仪表板列表和视图选择列表悬浮可以显示节点全称 2022-03-15 21:52:28 +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
65aaff16a1 feat: 增加 mongoDB 的连接字符串 2022-03-14 21:30:22 +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
junjun
f1b4c53725 feat: 视图高级设置 2022-03-11 18:00:44 +08:00
junjun
0f52816ea4 feat: 视图高级设置 2022-03-11 16:31:10 +08:00
junjun
6b73634575 feat: 视图高级设置 2022-03-11 16:24:34 +08:00
wangjiahao
48a27b0333 Merge remote-tracking branch 'origin/dev' into dev 2022-03-10 20:26:46 +08:00
wangjiahao
cfe1ed3fdc refactor: 仪表板视图操作优化 2022-03-10 20:26:31 +08:00
junjun
fdd3142887 fix: doris官网链接 2022-03-10 16:49:59 +08:00
junjun
b4b736de7e feat: 文本卡 2022-03-10 13:34:19 +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
junjun
b24a46e6f6 refactor: 颜色优化 2022-03-10 10:10:07 +08:00
taojinlong
0609d24555 feat: 支持精简模式 2022-03-09 20:03:50 +08:00
junjun
e275e533f5 feat: 透视表合计、小计 2022-03-09 15:45:48 +08:00
junjun
62f7cdd5e0 refactor: s2配置调整 2022-03-09 11:06:54 +08:00
junjun
172a0fb004 feat: 仪表盘阈值 2022-03-08 16:42:52 +08:00
junjun
c87f3eadb5 feat: 仪表盘阈值 2022-03-08 16:37:37 +08:00
junjun
5be238fc4f feat: 仪表盘阈值 2022-03-08 16:00:57 +08:00
junjun
f0a964f98e feat: 仪表盘阈值 2022-03-08 15:50:48 +08:00
junjun
6a36dd456c feat: 仪表盘阈值 2022-03-08 15:44:40 +08:00
junjun
a84820ba1e feat: 视图高级设置 2022-03-07 13:30:22 +08:00
taojinlong
2a7ce9aec7 Merge branch 'v1.8' into dev 2022-03-04 18:21:08 +08:00
taojinlong
264efa33bc fix: 自定义数据集支持 API 数据集 2022-03-04 11:38:28 +08:00
junjun
58fd0a56bf feat: 视图高级设置 2022-03-03 18:30:50 +08:00
taojinlong
3f889ab62d fix: 自助数据集 api 权限校验 2022-03-02 22:15:48 +08:00
junjun
99cfc74ef2 fix: 数据源权限 2022-03-02 18:59:32 +08:00
junjun
5dea56345c fix: 数据源权限 2022-03-02 18:57:11 +08:00
taojinlong
3d4e33c8ca fix: 创建关联数据集时，去掉空目录 2022-03-02 17:49:14 +08:00
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
75b2b77a40 refactor: 视图编辑增加关闭按钮 2022-03-02 15:04:25 +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
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
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
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
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
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
王嘉豪
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
王嘉豪
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
5141f52abb refactor: 视图权限 2022-02-28 11:19:32 +08:00
junjun
3e03239941 refactor: 视图权限 2022-02-28 11:17:26 +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
c32fce753d fix: 历史仪表板的公共链接打不开的问题 2022-02-24 18:14:32 +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
taojinlong
eb4dcab708 fix: 国际化 2022-02-23 18:29:55 +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
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
a1f5deaf82 feat: 过滤条件穿透到tab组件内部视图 2022-02-21 16:23:08 +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
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
junjun
8f39fbe3f5 feat: S2 pivot 2022-02-11 16:53:57 +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
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
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
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
junjie
9fc6cedca3 feat: S2 Event 2022-02-07 13:13:50 +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
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
6c9e34a1ee fix: 仪表板背景由颜色切换为图片，未加图片时背景颜色依然存在问题 2022-01-28 13:40:00 +08:00
wangjiahao
3274877f42 refactor: 更新首页教学视频链接 2022-01-28 13:36:28 +08:00
wangjiahao
8d4519445c refactor: 更新首页教学视频链接 2022-01-28 13:14:43 +08:00
wangjiahao
496962a68e fix: 仪表板背景由颜色切换为图片，未加图片时背景颜色依然存在问题 2022-01-28 13:08:44 +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
junjie
d1980bb2a6 fix: 指标拖拽问题 2022-01-26 17:59:45 +08:00
junjie
0eb0407e4f fix: 指标拖拽问题 2022-01-26 17:57:20 +08:00
wangjiahao
e20e236391 refactor: 首页优化 2022-01-26 16:18:16 +08:00
wangjiahao
17c9b3eac9 refactor: 首页优化 2022-01-26 15:30:01 +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
9885b9cc4a feat: 仪表板预览界面支持刷新，仪表板加载代码优化 2022-01-25 16:38:19 +08:00
taojinlong
f33e4b93c6 fix: 列权限校验 2022-01-25 13:52:57 +08:00
junjie
a854d0c9d2 refactor: 视图过滤字段值优化 2022-01-24 13:21:59 +08:00
junjie
b7d4b56a39 fix: 矩形树图属性 2022-01-24 13:21:59 +08:00
taojinlong
f15caf7330 fix: 校验数据源重复 2022-01-23 15:08:42 +08:00
fit2cloud-chenyw
67068aa416 refactor: 优化空仪表板收藏状态 2022-01-21 11:04:41 +08:00
wangjiahao
29080e0b89 fix: 分享仪表板联动信息失效问题 2022-01-20 18:31:40 +08:00
wangjiahao
372685035e refactor: 移动端布局拖动组件接近上下边界画布可以自动滚动 2022-01-20 11:33:41 +08:00
junjie
1846b282d6 refactor: 交互调整 2022-01-19 17:46:08 +08:00
taojinlong
5c351ea5e4 feat: 重复的数据源连接，保存时增加提示 2022-01-18 16:21:03 +08:00
taojinlong
aa2a44da0e Merge branch 'dev' of github.com:dataease/dataease into dev 2022-01-18 16:10:08 +08:00
taojinlong
b3f5426e91 feat: 重复的数据源连接，保存时增加提示 2022-01-18 16:09:54 +08:00
taojinlong
18c957cee1 feat: 重复的数据源连接，保存时增加提示 2022-01-18 16:06:28 +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
fit2cloud-chenyw
8700045786 fix: 过滤组件默认值不能覆盖编辑的预览值 2022-01-14 14:21:34 +08:00
fit2cloud-chenyw
a23e2601d7
Merge pull request #1634 from dataease/pr@dev@feat_default_pwd 
feat: 默认密码
 2022-01-12 17:47:26 +08:00
fit2cloud-chenyw
1714b7b017 feat: 默认密码 2022-01-12 17:46:14 +08:00
wangjiahao
7527d6561b refactor: 样式修改 2022-01-12 17:25:47 +08:00
wangjiahao
659899e31c Merge remote-tracking branch 'origin/dev' into dev 2022-01-12 16:57:57 +08:00
wangjiahao
c8491b069e refactor: 首页导航样式适配 2022-01-12 16:56:17 +08:00
fit2cloud-chenyw
977c520ab4 fix: 地图复位中心点错误 2022-01-12 12:25:01 +08:00
junjie
ee917eeab3 fix: 修复左侧tree重命名右侧更新不及时的问题 2022-01-12 11:26:29 +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
junjie
76523b5787 refactor: 视图样式配置项调整 2022-01-12 11:01:14 +08:00
junjie
3f028ce0b0 refactor: 视图样式配置项调整 2022-01-11 17:26:07 +08:00
Junjie
6bcd70444b
Merge pull request #1624 from dataease/pr@dev@refactor_chart_style 
refactor: 视图样式配置项调整
 2022-01-11 17:17:53 +08:00
junjie
5cff660cea refactor: 视图样式配置项调整 2022-01-11 17:16:22 +08:00
fit2cloud-chenyw
7d9214c203 feat: 年份、年月组件增加动态时间 2022-01-11 16:30:47 +08:00
junjie
b59c33ddd6 refactor: 视图样式配置项调整 2022-01-11 15:57:29 +08:00
junjie
792ad211c7 refactor: 视图样式配置项调整 2022-01-11 15:34:13 +08:00
junjie
36bf4206a9 refactor: 视图样式配置项调整 2022-01-11 15:29:28 +08:00
rc452860
00650ce9f2 feat: 添加数据库数据集时显示表注释 2022-01-11 11:11:54 +08:00
fit2cloud-chenyw
2de66cf8d7
Merge pull request #1610 from dataease/pr@dev@fix_dynamic_filter_date 
fix: 动态日期过滤组件月份逻辑
 2022-01-10 12:07:52 +08:00
fit2cloud-chenyw
44ba1f8db6 fix: 动态日期过滤组件月份逻辑 2022-01-10 12:06:42 +08:00
junjie
1bf4cc1c74 fix(视图): 修复视图保存后未刷新详情的问题 2022-01-10 11:37:33 +08:00
fit2cloud-chenyw
dc4c9ca3ac fix: 动态时间组件 2022-01-07 14:14:22 +08:00
taojinlong
7092dce543 Merge branch 'v1.6' of github.com:dataease/dataease into v1.6 2022-01-06 15:18:03 +08:00
taojinlong
93ff28704d fix: 兼容以前的公共链接 2022-01-06 15:16:50 +08:00
junjie
65dd6bc1e9 fix: 直连SQL数据集不支持制作关联数据集 2022-01-06 12:54:37 +08:00
taojinlong
e8c6762c1f fix: 处理数据源校验错误信息太长的问题 2022-01-05 21:30:03 +08:00
taojinlong
d35c03d828 fix: 查询数据时，先校验数据源有效性 2022-01-04 12:06:21 +08:00
taojinlong
55459dd8aa Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-31 10:42:52 +08:00
taojinlong
a8885c31f5 fix: 限制行权限 2021-12-31 10:37:05 +08:00
xiajunjie
a17e55c2d7 fix: 字段重名 2021-12-30 20:55:53 +08:00
xiajunjie
0c8d930ee5 fix: 视图加载大数据 2021-12-30 20:30:31 +08:00
fit2cloud-chenyw
c43fd82ba1 fix: 我的分享多个焦点 2021-12-30 19:31:28 +08:00
王嘉豪
79f82c274d
Merge pull request #1569 from dataease/pr@dev@feat-mobile-reset 
refactor: 国际化
 2021-12-30 15:59:27 +08:00
wangjiahao
4d8bb2d7d5 refactor: 国际化 2021-12-30 15:58:37 +08:00
taojinlong
7ffe5514a9 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-30 14:50:48 +08:00
taojinlong
47f9ca83bc fix: 枚举值接口支持行权限 2021-12-30 14:50:26 +08:00
fit2cloudrd
2dfe2e3cc0
style: 样式修改 (#1563) 
* style: 样式修改

* style: 样式修改

Co-authored-by: wangjiahao <1522128093@qq.com>
 2021-12-30 14:30:37 +08:00
wangjiahao
f20b58df80 style: 样式修改 2021-12-30 14:29:51 +08:00
junjie
613731700e fix: 弹框回车事件 2021-12-30 13:29:16 +08:00
fit2cloud-chenyw
1b174f589a fix: 公共链接有效期 2021-12-30 10:39:53 +08:00
junjie
9fa458a704 fix: 删除分组后，右侧界面关闭 2021-12-30 10:18:54 +08:00
fit2cloudrd
a386b6f2c7
style: 样式修改 
style: 样式修改
 2021-12-29 18:52:48 +08:00
taojinlong
eb69f3c68e fix: db2 分页问题 2021-12-29 18:34:27 +08:00
wangjiahao
83134fe15e fix: 修复视图分组图标可能被修改的问题 2021-12-29 11:54:17 +08:00
wangjiahao
e051792bde refactor: 仪表板新建视图关闭取消按钮 2021-12-29 11:25:27 +08:00
wangjiahao
60814ebc5f style: 仪表板树样式修改 2021-12-29 10:52:46 +08:00