github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-28 06:45:21 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
7,630 Commits 33 Branches 90 Tags 431 MiB
234fd70131
Commit Graph

2899 Commits

Author SHA1 Message Date
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
junjie
34a048d07a fix: 表格分页问题 2021-12-29 10:28:31 +08:00
taojinlong
69e9931d5c Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-28 18:44:33 +08:00
taojinlong
6bb37f0d4e fix: 公共链接行权限 2021-12-28 18:44:11 +08:00
wangjiahao
56ebd857cc Merge remote-tracking branch 'origin/dev' into dev 2021-12-28 17:53:02 +08:00
wangjiahao
892a967d24 refactor: 仪表板命名，相同目录下的仪表板和目录允许重名 2021-12-28 17:52:31 +08:00
taojinlong
96a830ebaf Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-28 17:18:00 +08:00
wangjiahao
4cb9e722a5 fix: 新建仪表板刷新浏览器第一次不出现问题 2021-12-28 17:03:48 +08:00
taojinlong
1e0d699afd fix: 行权限未清除之前的选择 2021-12-28 16:52:51 +08:00
wangjiahao
f47609fce5 refactor: 移动端布局等待区域排列优化 2021-12-28 16:35:30 +08:00
taojinlong
ec29826365 fix: token 过期时，上传 excel 跳转登陆页 2021-12-28 15:14:17 +08:00
wangjiahao
4a0e577ad1 fix: 修复编辑文本过滤组件后，显示错位问题 2021-12-28 12:12:46 +08:00
fit2cloud-chenyw
aa0cb3d725 fix: 时间范围动态时间限制 2021-12-28 11:32:48 +08:00
fit2cloud-chenyw
f678ae96ef
Merge pull request #1532 from dataease/pr@dev@feat_date_range_dynamic 
feat: 日期范围动态时间
 2021-12-27 18:09:13 +08:00
fit2cloud-chenyw
8b0c98e9cd feat: 日期范围动态时间 2021-12-27 18:04:59 +08:00
fit2cloudrd
c8814f9daa
fix: 文本搜索组件在预览和编辑时显示不一致 (#1529) 
fix: 文本搜索组件在预览和编辑时显示不一致
 2021-12-27 16:34:27 +08:00
taojinlong
46c45315db Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-27 16:27:27 +08:00
taojinlong
4786d23d2c feat: 数据集页面支持行权限 2021-12-27 16:26:59 +08:00
wangjiahao
215b4936c1 refactor: 地图组件移动端适配调整 2021-12-27 14:33:31 +08:00
wangjiahao
4f8ea205d3 refactor: 移动端布局等待区域优化地图，时间组件排列方式 2021-12-27 14:21:00 +08:00
wangjiahao
0c8454323a refactor: 移动端布局组件等待区域靠左排列 2021-12-27 12:06:42 +08:00
fit2cloud-chenyw
55d8022b5b fix: 空地图试图切换错误 2021-12-27 11:12:21 +08:00
fit2cloud-chenyw
8409f1dd65 style: 解决仪表板中缩放按钮遮盖 2021-12-25 14:54:46 +08:00
fit2cloud-chenyw
73ceca7477 feat: 地图增加缩放重置按钮 2021-12-25 14:42:07 +08:00
fit2cloudrd
787ef75b06
refactor: 优化PC移动端布局切换，防止出现错误仪表板布局 
Co-authored-by: wangjiahao <1522128093@qq.com>
 2021-12-24 17:54:28 +08:00
junjie
a5bc88859f feat(视图): 过滤器支持and、or逻辑 2021-12-24 17:27:13 +08:00
fit2cloud-chenyw
d5071d99bd fix: 动态日期逻辑 2021-12-24 17:10:01 +08:00
fit2cloud-chenyw
60e1e7cea9
Merge pull request #1510 from dataease/pr@dev@style_panel_left 
style: 仪表板组件样式
 2021-12-24 13:30:36 +08:00
fit2cloud-chenyw
7c37cccf79 style: 仪表板组件样式 2021-12-24 13:29:24 +08:00
junjie
d714866f74 feat(视图): 地图值不存在时，显示空 2021-12-24 13:29:23 +08:00
junjie
4527e02448 feat(视图): 地图值不存在时，显示空 2021-12-24 13:27:59 +08:00
junjie
ba09b4ebe1 feat: 视图tab样式调整 2021-12-23 18:50:58 +08:00
wangjiahao
77db760939 fix: 修复移动端部分组件无法选中问题 2021-12-23 18:15:49 +08:00
wangjiahao
5236b5ba21 feat: 图片支持超链接设置 2021-12-23 14:44:04 +08:00
wangjiahao
c3608e5ec2 refactor: 仪表板滚动时可以使过滤组件失去焦点隐藏弹框 2021-12-23 12:02:14 +08:00
wangjiahao
100e00e5a6 fix: 新加过滤组件，移动端布局无法保存问题 2021-12-22 18:31:46 +08:00
wangjiahao
d1d156c4dd refactor: 移动端加入新组件默认放到最底端 2021-12-22 16:36:33 +08:00
junjie
b3352c07c9 feat: 数据集入口适配 2021-12-22 11:42:44 +08:00
junjie
c0be638c5a feat(视图): 地图值不存在时，显示空 2021-12-21 16:24:45 +08:00
wangjiahao
b191c845a4 refactor: 移动端布局适配 2021-12-21 12:41:06 +08:00
王嘉豪
804ff0db21
Merge pull request #1480 from dataease/pr@dev@refactor_panel-scale 
refactor: 仪表板支持高清PDF导出
 2021-12-20 18:51:26 +08:00
wangjiahao
03cb1f0630 refactor: 仪表板支持高清PDF导出 2021-12-20 18:50:20 +08:00
taojinlong
940147a687 fix: 增加或删除数据源，只有一条数据时操作完需要刷新页面才会更新 2021-12-20 16:46:40 +08:00
junjie
dc36a06cb6 feat(视图): 文本类型过滤组件支持枚举 2021-12-20 14:06:44 +08:00
junjie
721b2774fd feat(视图): 过滤器支持and、or逻辑 2021-12-20 12:39:17 +08:00
王嘉豪
ffe3d8b9ef
Merge pull request #1474 from dataease/pr@dev@refactor_panel-scale 
refactor: 移动端仪表板展示适配
 2021-12-20 12:16:05 +08:00
wangjiahao
e59d5b803d refactor: 移动端仪表板展示适配 2021-12-20 12:14:57 +08:00
junjie
3de3b877d7 feat(视图): 文本类型过滤组件支持枚举 2021-12-20 11:36:56 +08:00
taojinlong
50d3a1c37f refactor: 解决冲突 2021-12-19 14:50:02 +08:00
taojinlong
a79a96f452 feat: 公共链接支持行权限 2021-12-19 14:46:33 +08:00
junjie
fe37d09a9e feat(视图): 文本类型过滤组件支持枚举 2021-12-17 18:16:18 +08:00
fit2cloud-chenyw
21e5624c22
Merge branch 'dev' into pr@dev@refactor_filter_default_value 2021-12-16 18:19:51 +08:00
fit2cloud-chenyw
3a3055280f feat: 新增时间控件动态默认值 2021-12-16 18:16:24 +08:00
wangjiahao
732cb32abf refactor: 过滤组件可以跟随仪表板缩放 2021-12-16 17:08:54 +08:00
wangjiahao
2ea9678dd8 feat: 仪表板处于公共链接模式，跳转的目标仪表板也以公共链接跳转，同时支持传参数 2021-12-14 15:22:03 +08:00
王嘉豪
791a76ca3c
Merge pull request #1437 from dataease/pr@dev@fix_panel-filter 
feat: 仪表板tab组件内视图，支持放大和编辑
 2021-12-14 11:45:24 +08:00
wangjiahao
beb295f38f feat: 仪表板tab组件内视图，支持放大和编辑 2021-12-14 11:43:41 +08:00
junjie
6cb70f33a5 feat(视图): 过滤器支持and、or逻辑 2021-12-13 16:38:22 +08:00
taojinlong
14536b648a Merge branch 'dev' into pr@dev@variable 2021-12-10 23:21:01 +08:00
taojinlong
1e60188abd feat(数据源): 数据集行权限 2021-12-10 23:20:17 +08:00
junjie
139bd804ad feat(视图): 同比环比 2021-12-10 15:58:01 +08:00
junjie
ea3133dd96 feat(视图): 同比环比 2021-12-10 11:37:26 +08:00
junjie
96fa9cc53e feat(数据集): 关联数据集 2021-12-10 11:23:07 +08:00
junjie
bfa247cbc3 feat(视图): 同比环比 2021-12-10 10:43:34 +08:00
junjie
bcabbf905d feat(视图): 同比环比 2021-12-09 18:32:30 +08:00
wangjiahao
99c6cfd9e4 fix: 仪表板编辑移入过滤组件时，点击叉号关闭出现占位未取消的问题 2021-12-09 18:26:42 +08:00
junjie
ff2445d195 feat(数据集): 关联数据集 2021-12-09 16:51:21 +08:00
junjie
aead715995 feat(数据集): 关联数据集 2021-12-09 16:24:45 +08:00
fit2cloud-chenyw
5fafcd610b
Merge pull request #1419 from dataease/pr@dev@mobile_star_status 
feat: 移动端收藏状态
 2021-12-09 12:48:18 +08:00
fit2cloud-chenyw
142ff835ca feat: 移动端收藏状态 2021-12-09 12:47:07 +08:00
junjie
46bac1769e feat(视图): 同环比前端UI 2021-12-09 12:05:01 +08:00
junjie
f52b94a0ce feat(视图): 同环比前端UI 2021-12-09 10:43:08 +08:00
junjie
dfb83b4a43 feat(视图): 同环比前端UI 2021-12-08 18:42:00 +08:00
taojinlong
94cb9b45e6 feat: 数据集行权限 2021-12-08 17:18:35 +08:00
wangjiahao
11515a5aeb fix: 仪表板预览时右侧边框间隔过大问题 2021-12-08 15:28:54 +08:00
wangjiahao
5998a6c286 feat: 仪表板支持移动端布局展示 2021-12-07 17:32:02 +08:00
taojinlong
7b6d444f1a Merge branch 'dev' into pr@dev@db2 2021-12-07 17:11:06 +08:00
taojinlong
ab7b7f541b feat(数据源): 支持 db2 2021-12-07 17:10:16 +08:00
junjie
4f10dafec4 refactor: 视图优化 2021-12-06 14:41:12 +08:00
wangjiahao
e95fd0aeee Merge remote-tracking branch 'origin/dev' into dev 2021-12-06 11:54:51 +08:00
wangjiahao
e9404e6d1f fix: 修复对树形结构操作时，可能有其他节点展开的问题 2021-12-06 11:54:34 +08:00
junjie
297b26ca29 refactor: 计算字段无需展示原始类型 2021-12-06 10:52:57 +08:00
junjie
5d83ffe0cf fix: rollback 2021-12-06 09:59:00 +08:00
junjie
1cd7936505 feat(数据集): 关联数据集 2021-12-03 17:37:22 +08:00
王嘉豪
2a9fdea052
Merge pull request #1387 from dataease/pr@dev@fix_panel-pdf 
fix: 修复仪表板pdf截图问题
 2021-12-03 17:36:10 +08:00
wangjiahao
08d46d8827 fix: 修复仪表板pdf截图问题 2021-12-03 17:35:18 +08:00
junjie
298acdae9a feat(数据集): 关联数据集 2021-12-03 15:58:36 +08:00
junjie
d8a0212a35 feat(数据集): 关联数据集 2021-12-02 18:33:49 +08:00
junjie
d6aa5740c0 feat(数据集): 关联数据集 2021-12-02 18:19:16 +08:00
junjie
a1909f59cd feat(数据集): 关联数据集 2021-12-02 17:54:56 +08:00
junjie
e3efc82fc5 feat(数据集): 关联数据集 2021-12-02 17:04:42 +08:00
王嘉豪
cfbc35fbc7
Merge pull request #1376 from dataease/pr@dev@refactor_panel-open 
refactor: 开启移动端设置
 2021-12-02 16:48:28 +08:00
junjie
4a8bfefac4 feat(数据集): 关联数据集 2021-12-02 16:40:14 +08:00
wangjiahao
601f9e4dcc refactor: 开启移动端设置 2021-12-02 16:37:11 +08:00
junjie
acb54573cb feat(数据集): 关联数据集 2021-12-02 14:58:42 +08:00
fit2cloud-chenyw
a27474644a
Merge pull request #1366 from dataease/pr@v1.5@refactor_eslint_error 
refactor: 前端eslint警告以及报错
 2021-12-01 18:05:57 +08:00
fit2cloud-chenyw
df13bfa008 refactor: 前端eslint警告以及报错 2021-12-01 18:04:53 +08:00
wangjiahao
b86c93be7f Merge remote-tracking branch 'origin/v1.5' into refactor_panel-pdf 2021-12-01 17:40:53 +08:00
wangjiahao
abb9f45698 refactor: 视图新建追加自动点击事件，当前新加视图高亮显示 2021-12-01 17:39:27 +08:00
fit2cloud-chenyw
6c8a2d7685 fix: 条件组件新增失败 2021-12-01 17:38:33 +08:00
fit2cloud-chenyw
784d5f335d fix: 文本列表多选切换单选无效 2021-12-01 17:06:51 +08:00
王嘉豪
ad262355f6
Merge pull request #1360 from dataease/pr@1.5@refactor_panel-pdf 
fix: 修复PDF导出没有背景的问题
 2021-12-01 16:48:34 +08:00
wangjiahao
92bdf3717c Merge remote-tracking branch 'origin/v1.5' into refactor_panel-pdf 2021-12-01 16:46:32 +08:00
wangjiahao
9247bb6188 fix: 修复PDF导出没有背景的问题 2021-12-01 16:42:12 +08:00
王嘉豪
93d8e58994
Merge pull request #1357 from dataease/pr@v1.5@refactor_panel-pdf 
fix: 画布出现滚动条时，拖入的组件会靠上的问题
 2021-12-01 15:15:00 +08:00
wangjiahao
f75d00eda6 fix: 画布出现滚动条时，拖入的组件会靠上的问题 2021-12-01 15:14:24 +08:00
taojinlong
cb9020b903 Merge branch 'v1.5' of github.com:dataease/dataease into v1.5 2021-12-01 11:56:57 +08:00
taojinlong
d0436c598b refactor: 国际化处理 2021-12-01 11:56:05 +08:00
wangjiahao
0c97b7b9b3 fix: 修复主题滑块删除最后一下主题，滑块箭头指向不对问题 2021-12-01 11:52:31 +08:00
xiajunjie
c93b5e3687 refactor: v1.5关闭关联数据集入口 2021-11-30 20:18:11 +08:00
fit2cloud-chenyw
606d80d6e9 fix: 链接分享可以选择今天已经过了的时间 2021-11-30 16:22:54 +08:00
taojinlong
32286160a6 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-30 15:53:14 +08:00
taojinlong
4d6f933ab8 fix: 数据源名称过长没有以...形式代替导致删除标识与名称重叠 2021-11-30 15:53:03 +08:00
junjie
e5c46a0711 feat(数据集): 关联数据集 2021-11-30 15:43:04 +08:00
王嘉豪
2673af28f0
Merge pull request #1331 from dataease/pr@dev@refactor_auth-model 
fix: 修复默认仪表板保存时无法实时显示在列表中的问题
 2021-11-30 15:26:09 +08:00
wangjiahao
37d6623db5 fix: 修复默认仪表板保存时无法实时显示在列表中的问题 2021-11-30 15:24:51 +08:00
XiaJunjie2020
c365c5c7c1
Merge pull request #1330 from dataease/pr@dev@feat_union_ds 
feat(数据集): 关联数据集
 2021-11-30 15:21:21 +08:00
junjie
c7aa73cdd0 feat(数据集): 关联数据集 2021-11-30 15:19:51 +08:00
王嘉豪
748158ecb5
Merge pull request #1329 from dataease/pr@dev@refactor_auth-model 
fix: 优化仪表板编辑时，边界可能间隙不一致
 2021-11-30 15:17:09 +08:00
wangjiahao
ef6ae66859 fix: 优化仪表板编辑时，边界可能间隙不一致 2021-11-30 15:14:43 +08:00
taojinlong
d19f0f2a24 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-30 13:55:21 +08:00
junjie
68f6a6e749 fix(权限): 统一授权数据集tree 2021-11-30 13:38:50 +08:00
taojinlong
f8279b1141 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-30 12:28:42 +08:00
taojinlong
e654cafa68 refactor: 调整表单样式 2021-11-30 12:28:22 +08:00
junjie
2b2db1c8fc feat(数据集): 关联数据集 2021-11-30 10:06:04 +08:00
王嘉豪
e65b15b89b
Merge pull request #1318 from dataease/pr@dev@refactor_panel-speed 
refactor: 过滤组件样式边界优化
 2021-11-29 19:20:31 +08:00
wangjiahao
02bcadae10 refactor: 过滤组件样式边界优化 2021-11-29 19:18:12 +08:00
junjie
ff7c93ed3c feat(数据集): 关联数据集 2021-11-29 18:28:51 +08:00
taojinlong
dbd2159a6d Merge branch 'dev' of github.com:dataease/dataease into dev 
# Conflicts:
#	frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue
 2021-11-29 17:55:45 +08:00
taojinlong
63d3e5d015 feat(数据集): 添加同步任务时，过滤掉空目录 2021-11-29 17:48:41 +08:00
XiaJunjie2020
4e6f2f94fe
Merge pull request #1314 from dataease/pr@dev@feat_union_ds 
feat(数据集): 关联数据集
 2021-11-29 17:21:55 +08:00
fit2cloud-chenyw
b28c84319e
Merge pull request #1313 from dataease/pr@dev@fix_条件组件弹框样式 
fix: 条件组件弹框样式
 2021-11-29 17:21:03 +08:00
junjie
b2dc85232a feat(数据集): 关联数据集 2021-11-29 17:21:02 +08:00
fit2cloud-chenyw
c48e2ef9d6 fix: 条件组件弹框样式 2021-11-29 17:19:41 +08:00
王嘉豪
b912c1fb97
Merge pull request #1312 from dataease/pr@dev@refactor_panel-speed 
refactor: 仪表板视图过滤弹框，去掉搜索条件时无需关闭
 2021-11-29 15:56:38 +08:00
wangjiahao
079f24d7c8 refactor: 仪表板视图过滤弹框，去掉搜索条件时无需关闭 2021-11-29 15:55:48 +08:00
XiaJunjie2020
95f55ddf8e
Merge branch 'dev' into pr@dev@feat_union_dataset 2021-11-29 15:33:43 +08:00
junjie
a6e8d16ccf fix(视图): 修复图表类型有时样式错乱 2021-11-29 15:18:10 +08:00
王嘉豪
3c8ce0e31d
Merge pull request #1306 from dataease/pr@dev@refactor_panel-speed 
refactor: 前端增加菜单缓存，加快相应速度
 2021-11-29 14:55:20 +08:00
wangjiahao
7cc5169ab7 refactor: 前端增加菜单缓存，加快相应速度 2021-11-29 14:54:24 +08:00
junjie
199af4407c feat(数据集): 关联数据集 2021-11-29 14:50:45 +08:00
fit2cloud-chenyw
33c6fba964 fix: 公共链接分享密码错误提示位置覆盖 2021-11-29 14:26:21 +08:00
fit2cloud-chenyw
8f00ea4783
Merge pull request #1301 from dataease/pr@dev@fix_my_share_tree 
fix: 我分享的没有及时刷新
 2021-11-29 13:53:37 +08:00
fit2cloud-chenyw
b9348f13ac fix: 我分享的没有及时刷新 2021-11-29 13:52:35 +08:00
wangjiahao
521b35f9b5 refactor: 优化系统响应速度 2021-11-29 11:35:51 +08:00
junjie
79349604fe feat(数据集): 关联数据集 2021-11-26 18:13:27 +08:00
王嘉豪
13198c7c15
Merge pull request #1285 from dataease/pr@dev@fix_panel-edit 
fix: 修复antV视图多事件弹框点击不显示问题
 2021-11-26 12:10:40 +08:00
wangjiahao
ff1a52d7c4 fix: 修复antV视图多事件弹框点击不显示问题 2021-11-26 12:09:48 +08:00
taojinlong
5899876a09 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-26 11:39:42 +08:00
fit2cloud-chenyw
07440bfa8f
Merge pull request #1284 from dataease/pr@dev@refactor_multiple_entry 
fix: 前端改为单页面应用
 2021-11-26 11:39:39 +08:00
taojinlong
436770fe34 fix(数据集): 先选择定时同步再选择数据库可实现不支持定时同步的数据库定时同步 2021-11-26 11:39:30 +08:00
fit2cloud-chenyw
26c54d41bc fix: 前端改为单页面应用 2021-11-26 11:38:25 +08:00
wangjiahao
f4e23f7f60 fix: 修复系统主题标题错位问题 2021-11-26 10:28:43 +08:00
taojinlong
f8f285155d Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-25 22:02:15 +08:00
taojinlong
04871b182b fix(数据源): 删除数据源时，同时清理页面缓存 2021-11-25 22:02:07 +08:00
fit2cloudrd
5c8ae8289d
refactor: 优化顶部菜单栏隐藏条件 
Co-authored-by: wangjiahao <1522128093@qq.com>
 2021-11-25 17:07:31 +08:00
junjie
4848185ba5 feat(数据集): 关联数据集 2021-11-25 16:33:38 +08:00
wangjiahao
1eeda595f1 refactor: 优化数据集查询 2021-11-25 15:17:00 +08:00
junjie
3c78b3bec2 feat(数据集): 关联数据集 2021-11-25 11:33:47 +08:00
taojinlong
db249689c7 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-24 18:50:07 +08:00
taojinlong
bf7c8bb333 refactor: 整理代码 2021-11-24 18:49:41 +08:00
wangjiahao
c15c58f63d feat: 增加授权模型统一查询功能，视图使授权模型查询 2021-11-24 18:14:41 +08:00
wangjiahao
066e6b57da fix: 默认仪表板不需要显示编辑按钮 2021-11-24 11:49:40 +08:00
王嘉豪
77a31d7b8c
Merge pull request #1261 from dataease/pr@dev@feat_panel-view-result 
feat: 仪表板支持统一设置视图结果显示数量
 2021-11-24 11:27:17 +08:00
wangjiahao
abb58954af feat: 仪表板支持统一设置视图结果显示数量 2021-11-24 11:25:01 +08:00
XiaJunjie2020
7d07a2c81d
Merge pull request #1256 from dataease/pr@dev@feat_union_dataset 
feat(数据集): 关联数据集
 2021-11-23 17:37:46 +08:00
junjie
0069c5a4b1 feat(数据集): 关联数据集 2021-11-23 17:34:54 +08:00
junjie
7329b819a4 fix(视图): 修复图表类型切换逻辑 2021-11-23 16:54:01 +08:00
junjie
ea3c070d19 feat(数据集): 关联数据集 2021-11-23 15:38:24 +08:00
王嘉豪
16e807bce0
feat(仪表板): 仪表板支持设置移动端布局 
* feat:仪表板移动端布局

* feat(仪表板): 仪表板支持设置移动端布局
 2021-11-23 15:34:42 +08:00
junjie
d0561e8699 feat(数据集): 关联数据集 2021-11-23 14:31:24 +08:00
wangjiahao
cde5fb9ee6 refactor: 移除画布设计时滚动条，优化设计体验 2021-11-23 11:35:02 +08:00
wangjiahao
bc5c98c98c fix: 修复仪表板编辑按钮权限取值不对问题 2021-11-23 10:49:18 +08:00
taojinlong
e50158bc57 feat(数据集): 行权限 2021-11-22 15:40:29 +08:00
junjie
7ad24c38c3 feat(数据集): 关联数据集 2021-11-19 18:42:59 +08:00
junjie
6559ad7582 feat(数据集):关联数据集 2021-11-18 18:16:43 +08:00
wangjiahao
fcb5d1cec6 refactor:仪表板刷新时，不显示视图的动画效果；仪表板初始化时显示loading框 2021-11-16 15:06:02 +08:00
wangjiahao
c53e121ce8 refactor:从仪表板进入视图编辑界面时，顶部菜单去掉 2021-11-15 18:52:58 +08:00
fit2cloud-chenyw
34d9a477b8
Merge pull request #1204 from dataease/pr@dev@feat_消息订阅增加邮件渠道 
feat: 消息订阅增加邮件渠道
 2021-11-15 16:24:42 +08:00
fit2cloud-chenyw
5ce64f0d09 feat: 消息订阅增加邮件渠道 2021-11-15 16:23:24 +08:00
taojinlong
6c6fb924c5 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-15 15:57:13 +08:00
taojinlong
566a317005 feat: 行权限 2021-11-15 15:53:40 +08:00
王嘉豪
e2883a86bf
Merge pull request #1202 from dataease/pr@dev@refactor_panel 
feat:仪表编辑状态，自动隐藏顶部餐单栏
 2021-11-15 14:57:51 +08:00
wangjiahao
3f5624a630 feat:仪表编辑状态，自动隐藏顶部餐单栏 2021-11-15 14:57:14 +08:00
junjie
19a8ed02a0 feat:词云 2021-11-15 13:11:21 +08:00
wangjiahao
71438db6e1 refactor:组件调色板优化 2021-11-15 11:53:42 +08:00
junjie
22e204a0b7 feat:词云 2021-11-15 11:29:13 +08:00
王嘉豪
09f4e13b3f
Merge pull request #1189 from dataease/pr@dev@refactor_panel-edit 
refactor:优化组件间隙和仪表板画布间隙
 2021-11-12 12:07:44 +08:00
wangjiahao
ffa54ad6de refactor:优化组件间隙和仪表板画布间隙 2021-11-12 12:07:06 +08:00
王嘉豪
c3e7584e1e
Merge pull request #1182 from dataease/pr@dev@refactor_panel-edit 
refactor:修改仪表板按钮样式
 2021-11-12 10:39:58 +08:00
wangjiahao
5746be12a4 refactor:修改仪表板按钮样式 2021-11-12 10:38:41 +08:00
taojinlong
d283f6a980 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-11 17:56:41 +08:00
taojinlong
d82f121cf1 refactor: 任务状态字体颜色调整 2021-11-11 17:54:54 +08:00
fit2cloud-chenyw
a584f141ed
Merge pull request #1176 from dataease/pr@dev@feat_short_link 
feat: 完善公共链接
 2021-11-11 16:58:28 +08:00
fit2cloud-chenyw
17a3b79e5b feat: 完善公共链接 2021-11-11 16:56:54 +08:00
junjie
efda0da019 feat(数据集):数据集字段管理页面，增加同步字段功能 2021-11-11 16:38:16 +08:00
wangjiahao
133ae7c70b refactor:增加仪表板编辑快捷入口 2021-11-11 15:43:07 +08:00
junjie
e27fe72703 fix(视图):尝试解决源码运行，视图类型样式错乱的问题 2021-11-11 14:35:50 +08:00
fit2cloud-chenyw
6afdfca886 fix: 前端用户列表控制台报错 2021-11-11 14:16:56 +08:00
fit2cloud-chenyw
54a2c63d4c fix: 取消短链接 2021-11-11 14:16:42 +08:00
junjie
86fd2cfbbd fix(视图):尝试解决源码运行，视图类型样式错乱的问题 2021-11-11 14:03:52 +08:00
taojinlong
99638187bb
Merge pull request #1164 from dataease/hive 
feat: 支持 hive 数据源
 2021-11-10 18:45:15 +08:00
taojinlong
de4f71c6bc feat: 支持 hive 数据源 2021-11-10 18:42:44 +08:00
fit2cloud-chenyw
5cfedd4a44
Merge pull request #1163 from dataease/pr@dev@feat_完善我的分享 
feat: 完善我的分享
 2021-11-10 18:05:21 +08:00
fit2cloud-chenyw
08ea1fafea feat: 完善我的分享 2021-11-10 18:04:20 +08:00
junjie
dc24bf4b18 feat(视图):视图保留实时计算与渲染功能，但不实时保存，提供保存与重置按钮 2021-11-10 17:38:14 +08:00
junjie
fb533cde83 feat(视图):视图保留实时计算与渲染功能，但不实时保存，提供保存与重置按钮 2021-11-10 17:10:49 +08:00
junjie
30fee4e97d feat(视图):视图保留实时计算与渲染功能，但不实时保存，提供保存与重置按钮 2021-11-10 16:11:45 +08:00
junjie
902ac5bb7a feat(视图):视图保留实时计算与渲染功能，但不实时保存，提供保存与重置按钮 2021-11-10 13:44:08 +08:00
junjie
c5230ed42a feat(数据集):数据集字段管理页面，增加同步字段功能 2021-11-10 10:08:14 +08:00
fit2cloud-chenyw
f04aee4cf2
Merge pull request #1154 from dataease/pr@dev@feat_share_out 
feat: 新增我分享的
 2021-11-09 18:25:07 +08:00
fit2cloud-chenyw
db55c0782a feat: 新增我分享的 2021-11-09 18:23:45 +08:00
wangjiahao
30f55f72f6 fix:【仪表板】排版整齐后，通过新建视图，向仪表板中添加，位置有些错乱 2021-11-09 18:05:03 +08:00
junjie
0bb4c9da53 feat(数据集):数据集字段管理页面，增加同步字段功能 2021-11-09 12:13:41 +08:00
王嘉豪
c6aa9af3e7
Merge pull request #1148 from dataease/pr@dev@feat_panel-video 
refactor:优化授权查询模型
 2021-11-09 11:20:39 +08:00
junjie
05710c4cad feat:视图根据图表类型分类 2021-11-09 11:16:35 +08:00
wangjiahao
f32ba3be80 feat:仪表板新增视频组件 2021-11-08 19:03:09 +08:00
junjie
708e2098ab feat:视图根据图表类型分类 2021-11-08 17:57:38 +08:00
junjie
57d5a6f02e feat:词云 2021-11-08 11:30:13 +08:00
junjie
5e5d456f84 refactor: 瀑布图图例文字优化 2021-11-05 13:55:28 +08:00
junjie
392f6fd434 fix: 视图指标卡标题位置修复 2021-11-04 17:17:39 +08:00
wangjiahao
846e90e6f5 fix:边界问题 2021-11-04 10:50:36 +08:00
wangjiahao
c7ad0a5b39 fix:边界问题 2021-11-04 10:50:00 +08:00
wangjiahao
f31eb4efbc feat:刷新时间可以选择单位 2021-11-03 17:44:20 +08:00
王嘉豪
f802d8e4f2
Merge pull request #1060 from dataease/pr@dev@refactor_panel-show 
refactor:仪表板刷新到秒级别
 2021-11-03 16:58:47 +08:00
wangjiahao
d739f203d9 fix:跳转设置删除配置后再打开显示字段id 2021-11-03 15:07:32 +08:00
taojinlong
d7aa576a02 fix: 校验数据源 2021-11-03 11:28:57 +08:00
junjie
34e187792b fix: 直连sql，不支持数据关联 2021-11-03 11:14:14 +08:00
junjie
0dac6cead2 fix: 创建关联关系弹框清空上次选项 2021-11-03 11:12:52 +08:00
junjie
2a78e0810f fix: 创建视图阻止回车事件提交form 2021-11-03 11:12:08 +08:00
wangjiahao
adb31a388f refactor:切换矩阵式与悬浮时建议优化 2021-11-02 23:08:38 +08:00
wangjiahao
95fdfc16c6 fix:选择时间组件后拖动时间组件,顶部的操作栏不会跟着一起移动 2021-11-02 16:40:49 +08:00
wangjiahao
fcc05f3121 refactor:跳转设置,联动视图增加图标 2021-11-02 16:12:49 +08:00
junjie
aac301b462 feat:词云 2021-11-02 16:06:12 +08:00
junjie
40cf834a48 refactor: 轴线自定义刻度数限制不超过100 2021-11-02 16:01:30 +08:00
XiaJunjie2020
d8a80fba39
Merge pull request #1110 from dataease/pr@dev@refactor_axis_split_count 
refactor: 轴线自定义刻度数限制不超过100
 2021-11-02 15:46:53 +08:00
taojinlong
a9f5e1a6a5 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-02 15:45:27 +08:00
taojinlong
76141c85dc feat: 更新数据源,左侧树状结构保持不变 2021-11-02 15:44:35 +08:00
junjie
d2a6ad05b4 refactor: 轴线自定义刻度数限制不超过100 2021-11-02 15:35:53 +08:00
fit2cloud-chenyw
f58adcda97 fix: 公共链接分享老密码过长 2021-11-02 15:20:32 +08:00
fit2cloud-chenyw
39d240d6b0 refactor: 主题另存为功能 2021-11-02 15:20:18 +08:00
junjie
96749e35e3 feat:词云 2021-11-02 12:33:06 +08:00
XiaJunjie2020
2e32349cdb
Merge pull request #1106 from dataease/pr@dev@feat_word_cloud 
feat:词云
 2021-11-02 12:19:23 +08:00
junjie
e3d9f78200 fix: 指针图图例修复 2021-11-02 12:14:47 +08:00
junjie
5300ed1a7d feat:词云 2021-11-02 12:01:42 +08:00
junjie
f38186cee0 feat:调色板默认色 2021-11-02 10:32:30 +08:00
fit2cloud-chenyw
afda4530ec fix: 基础设置表单验证 2021-11-01 18:46:21 +08:00
taojinlong
896b6a4c66 feat: redshift mongo 只有直连模式 2021-11-01 18:31:38 +08:00
taojinlong
ddde405508 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-01 18:28:18 +08:00
fit2cloud-chenyw
4fc2031371 Merge branch 'dev' of fit2cloud:dataease/dataease into dev 2021-11-01 18:00:22 +08:00
fit2cloud-chenyw
c4204e2866 refactor: 优化公共链接参数长度 2021-11-01 17:59:48 +08:00
taojinlong
e1dd3f90de feat: redshift 数据源 2021-11-01 17:33:31 +08:00
wangjiahao
c7bfab9654 fix:文本链接修改，仪表板底色修改，保存按钮还是灰的问题 2021-11-01 17:24:56 +08:00
junjie
83d6a83a6b feat:瀑布图 2021-11-01 16:38:42 +08:00
taojinlong
99f680523f Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-01 15:00:56 +08:00
taojinlong
308a0f9393 feat: redshift 2021-11-01 15:00:33 +08:00
taojinlong
e012c76ef0 perf: 优化任务日志的请求超时 2021-11-01 14:13:19 +08:00
fit2cloud-chenyw
1d6467f54f feat: 开源版用户列表隐藏角色和组织 2021-11-01 14:11:54 +08:00
wangjiahao
7d4bea2190 fix:修改跳转设置可能保存不上的问题 2021-11-01 12:12:56 +08:00
junjie
e2e489e2b7 feat:瀑布图 2021-11-01 10:48:47 +08:00
fit2cloud-chenyw
a4101d4b66
Merge pull request #1031 from dataease/pr@dev@custom_theme 
feat: 新增自定义主题
 2021-10-31 02:05:15 +08:00
fit2cloud-chenyw
50ff8d5b44 feat: 自定义主题基本功能 2021-10-31 02:01:52 +08:00
wangjiahao
001c974e9f refactor:仪表板刷新到秒级别 2021-10-29 17:46:04 +08:00
王嘉豪
97ddcf69c9
Merge pull request #1057 from dataease/pr@dev@refactor_panel-show 
fix:仪表板跳转联动选项值显示异常
 2021-10-29 13:51:16 +08:00
wangjiahao
7ca65ff280 fix:仪表板跳转联动选项值显示异常 2021-10-29 13:47:18 +08:00
XiaJunjie2020
04c7a3c979
Merge pull request #1052 from dataease/pr@dev@fix_antv 
fix: antv点击坐标
 2021-10-29 13:40:24 +08:00
junjie
c5f997ac4e fix: antv点击坐标 2021-10-29 13:39:14 +08:00
wangjiahao
5ce24a47b2 refactor:仪表板跳转优化，样式调整，国际化等 2021-10-29 12:53:25 +08:00
junjie
69e0f49c8e feat: 视图支持设置结果展示 2021-10-29 10:32:06 +08:00
wangjiahao
d9071fdc52 refactor:代码回退 2021-10-28 18:36:05 +08:00
junjie
5d57b7ad1e feat: 视图支持设置结果展示 2021-10-28 18:02:56 +08:00
junjie
d7ad1b86d2 feat: 视图支持设置结果展示 2021-10-28 17:22:46 +08:00
wangjiahao
1a5159f40d Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	backend/src/main/resources/db/migration/V27__de1.4.sql
 2021-10-28 17:05:50 +08:00
wangjiahao
8ec93a1337 feat:仪表板支持仪表板之间跳转，外部链接跳转 2021-10-28 17:05:16 +08:00
junjie
34df55d281 feat: 明细表page size属性位置调整 2021-10-28 14:33:21 +08:00
junjie
2f46571f17 feat: 表格合计调整 2021-10-28 11:37:50 +08:00
junjie
18c2c190d2 fix: rollback 2021-10-25 17:01:05 +08:00
taojinlong
1ef965357d feat: 登录时，对用户名密码加密 2021-10-25 15:36:51 +08:00
taojinlong
54ef74ff4b feat: 支持mongodb 2021-10-25 12:22:01 +08:00
fit2cloud-chenyw
1e4b40dd23
Merge pull request #1007 from dataease/pr@dev@feat_basic_setting 
feat: 增加超时时间配置
 2021-10-22 15:08:41 +08:00
fit2cloud-chenyw
b609955a44 feat: 增加超时时间配置 2021-10-22 15:06:50 +08:00
junjie
027844a850 feat:瀑布图 2021-10-22 10:19:30 +08:00
junjie
11f2ae5b67 feat:瀑布图 2021-10-22 10:05:53 +08:00
fit2cloud-chenyw
dc3288dba3 style: UI微调 2021-10-21 18:26:10 +08:00
junjie
6fd580e2f7 feat:antv 2021-10-21 17:37:13 +08:00
junjie
90c2b261ba feat:antv 2021-10-21 16:11:51 +08:00
fit2cloud-chenyw
4bbbee07e0 fix: 去除仪表板分享有效期'此刻' 2021-10-21 14:38:06 +08:00
fit2cloud-chenyw
18d7561aec
Merge pull request #999 from dataease/pr@dev@feat_email 
feat: 增加邮件配置
 2021-10-21 13:51:24 +08:00
fit2cloud-chenyw
d3952387c1 feat: 增加邮件配置 2021-10-21 13:49:58 +08:00
junjie
485304b113 feat:瀑布图 2021-10-21 11:36:39 +08:00
junjie
4d0d4e2bc6 feat:瀑布图 2021-10-21 11:09:34 +08:00
junjie
1abfbef7b6 feat:瀑布图 2021-10-21 10:49:03 +08:00
junjie
78f5a9892a feat:详情icon 2021-10-20 17:12:09 +08:00
fit2cloud-chenyw
ccc539f5b0
Merge pull request #984 from dataease/pr@dev@feat_public_link_over_time 
feat: 公共链接增加有效期
 2021-10-20 14:05:47 +08:00
fit2cloud-chenyw
a7144fd0cb feat: 公共链接增加有效期 2021-10-20 14:03:50 +08:00
junjie
656cd6f2c9 refactor：代码优化 2021-10-20 12:25:51 +08:00
junjie
e80060c042 feat:视图、数据集title后增加'...'图标 2021-10-20 11:46:49 +08:00
junjie
d2e40baf2d feat:增加默认颜色等 2021-10-20 11:32:05 +08:00
wangjiahao
55e39cbf04 feat:增加图片样式组件，统一样式组件设置 2021-10-19 19:11:40 +08:00
fit2cloud-chenyw
1bf3f1d5e2 feat: 增加仪表板时间组件 2021-10-19 15:00:24 +08:00
junjie
5be5814f7d feat:antv 2021-10-15 16:49:15 +08:00
junjie
e924a9af2d feat:antv 2021-10-15 12:36:06 +08:00
junjie
2cefa6f20f feat:antv 2021-10-15 12:26:52 +08:00
王嘉豪
0b5f5b10e7
Merge pull request #944 from dataease/pr@dev@feat_panel-hyperlinks 
refactor:PDF导出，模板导出等增加数据准备提示，PDF导出后自动关闭对话框
 2021-10-15 10:37:38 +08:00
wangjiahao
c6482a8e84 refactor:PDF导出，模板导出等增加数据准备提示，PDF导出后自动关闭对话框 2021-10-15 10:36:25 +08:00
junjie
412432acf8 feat:antv 2021-10-14 18:06:19 +08:00
taojinlong
7ff9b00deb feat: druid 替换 c3p0; 以类加载的方式引入数据源驱动；支持myqsl5.1 2021-10-14 17:55:27 +08:00
taojinlong
48fc0234cf fix: excel 替换后，字段标示没有重新渲染 2021-10-14 10:16:31 +08:00
taojinlong
0904b24a8f fix: 【数据集】追加excel时创建excel提示异常 2021-10-13 18:45:29 +08:00
fit2cloud-chenyw
33842ef0d7
Merge pull request #927 from dataease/pr@dev@style_dataset 
style: 数据集样式优化
 2021-10-13 15:32:55 +08:00
fit2cloud-chenyw
f5e0235815 style: 数据集样式优化 2021-10-13 15:31:03 +08:00
wangjiahao
df1336241c refactor: 去掉无用的注释 2021-10-13 15:11:48 +08:00
wangjiahao
e0b3e6a2c1 Merge remote-tracking branch 'origin/v1.3' into v1.3 2021-10-13 14:19:31 +08:00
wangjiahao
7a8198b7c7 refactor: 优化编辑时全屏问题，scroll时 样式组件定位问题，去掉部分前段日志 2021-10-13 14:19:17 +08:00
fit2cloud-chenyw
ccb0f91cdb
Merge pull request #922 from dataease/pr@dev@fix_share 
Pr@dev@fix share
 2021-10-13 12:20:48 +08:00
wangjiahao
1dda00c5a8 refactor: 防止编辑状态全屏错位 2021-10-13 12:20:12 +08:00
fit2cloud-chenyw
cd15048a1d
Merge pull request #921 from dataease/pr@dev@fix_share 
fix: 修复文本列表未及时刷新数据；分享列表不能收藏。
 2021-10-13 12:19:28 +08:00
fit2cloud-chenyw
0c02ffef0f fix: 修复文本列表未及时刷新数据；分享列表不能收藏。 2021-10-13 12:18:25 +08:00
wangjiahao
e1a151a3cc feat: tab组件增加样式设计 2021-10-13 11:30:02 +08:00
wangjiahao
354afd5d7b fix: 主题名称超出边界问题 2021-10-13 10:36:45 +08:00
wangjiahao
ffff72d403 Merge remote-tracking branch 'origin/dev' into dev 2021-10-12 18:38:53 +08:00
wangjiahao
b23dd3d8f0 refactor: 主题名称修改优化 2021-10-12 18:38:33 +08:00
fit2cloud-chenyw
6c08fdc967
Merge pull request #914 from dataease/pr@dev@fix_style_tapd 
style: 主题切换样式查漏补缺
 2021-10-12 18:25:52 +08:00
fit2cloud-chenyw
81e795b5f0 style: 主题切换样式查漏补缺 2021-10-12 18:24:27 +08:00
wangjiahao
f4e07fc869 Merge remote-tracking branch 'origin/dev' into dev 2021-10-12 17:50:15 +08:00
wangjiahao
e7cb8e63dd refactor: 矩阵按钮修改 文案修改 2021-10-12 17:48:07 +08:00
fit2cloud-chenyw
bd994d61d9 fix: 完善深色主题 2021-10-12 16:36:00 +08:00
wangjiahao
c81ca9d249 fix: 修复过滤组件取消，图片上传取消矩阵模式依然占位的问题 2021-10-12 12:33:00 +08:00
wangjiahao
b5e0c6bd84 Merge remote-tracking branch 'origin/dev' into dev 2021-10-12 11:33:51 +08:00
wangjiahao
30a7ec804c refactor: 代码回退 2021-10-12 11:33:27 +08:00
junjie
aa68de259c feat:过滤条件优化 2021-10-12 11:14:05 +08:00
wangjiahao
dadb1f4f4d refactor: 视图默认样式优先级设置为'视图'，画布优化等 2021-10-12 11:05:29 +08:00
wangjiahao
264637566e Merge remote-tracking branch 'origin/dev' into dev 2021-10-11 23:28:03 +08:00
wangjiahao
a3ed8a3b49 refactor: 优化拖拽阴影动画效果等,设置仪表板视图相关背景参数默认值 2021-10-11 23:27:48 +08:00
fit2cloud-chenyw
2bf3d3f137
Merge pull request #903 from dataease/pr@dev@style_theme_panel 
style: 完善深色主题样式
 2021-10-11 19:11:39 +08:00
fit2cloud-chenyw
4161aa6f83 style: 完善深色主题样式 2021-10-11 18:39:43 +08:00
taojinlong
7faa88f2d3 fix: 限制数据源端口号 2021-10-11 17:09:29 +08:00
taojinlong
a4157ca8f2 fix: 限制数据源端口号 2021-10-11 15:06:18 +08:00
taojinlong
2e57eb8768 fix: 【数据源】JDBC额外字段无法修改 2021-10-11 12:19:19 +08:00
wangjiahao
158b3a1e29 refactor: 画布按钮位置调整 2021-10-10 23:44:10 +08:00
wangjiahao
0bb8ccaea8 fix: 刷新时间设置时间被还原问题 2021-10-10 17:19:26 +08:00
wangjiahao
eaf256eed6 refactor: 修复画板部分拖拽问题，增加位置交换动画效果等 2021-10-10 14:20:51 +08:00
wangjiahao
549bf0da53 Merge remote-tracking branch 'origin/dev' into dev 2021-10-09 22:38:27 +08:00
wangjiahao
e9bd3bfdfc refactor: 画板优化 2021-10-09 22:36:47 +08:00
fit2cloud-chenyw
01d2c4acc5
Merge pull request #899 from dataease/pr@dev@style_theme_switch 
style: 优化主题样式
 2021-10-09 18:24:59 +08:00
fit2cloud-chenyw
ac86a48810 style: 优化主题样式 2021-10-09 18:22:52 +08:00
wangjiahao
6ceddf85e4 refactor: 增加视图的分布方式初始化数据 2021-10-09 18:22:11 +08:00
wangjiahao
f8693b522c refactor: 优化滚动条问题 2021-10-09 17:16:37 +08:00
wangjiahao
4da24c0cf5 refactor: 更改矩阵设计按钮位置 2021-10-09 13:58:31 +08:00
wangjiahao
0898bd74e6 feat:仪表板主题名称双击可修改 2021-10-09 11:32:51 +08:00
wangjiahao
72f7b8206f feat:仪表板主题名称双击可修改 2021-10-09 11:16:37 +08:00
wangjiahao
7efac43e55 feat:画板优化 2021-10-09 00:02:06 +08:00
fit2cloud-chenyw
64dba996fe perf: 优化主题结构打包后样式差异 2021-10-08 18:13:12 +08:00
fit2cloud-chenyw
d7d07b91df
Merge pull request #894 from dataease/pr@dev@feat_theme_switch 
feat: 增加主题切换
 2021-10-08 17:26:45 +08:00
fit2cloud-chenyw
d83bebfad6 feat: 增加主题切换 2021-10-08 17:22:21 +08:00
taojinlong
8fffb3d78a feat: 【数据集】添加 Excel 数据集，加入上传说明 2021-09-30 16:28:37 +08:00
taojinlong
bc1462c415 feat: 【数据源】用户可以通过JDBC连接字符串的配置连接到任意支持JDBC的数据库 2021-09-29 18:26:47 +08:00
taojinlong
814aee0e15 fix: 【数据源】新建数据源至空必要参数，部分必要参数未弹出提示 2021-09-29 16:55:55 +08:00
taojinlong
bc23fb6306 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-09-27 16:54:17 +08:00
taojinlong
cf5cf54363 feat: 【数据源】数据源类型增加mariadb和doris分类 2021-09-27 16:54:07 +08:00
fit2cloud-chenyw
d3929f5f03
Merge pull request #886 from dataease/pr@dev@style_de_tabs 
style: 调整仪表板tabs组件样式
 2021-09-26 17:56:25 +08:00
taojinlong
12755fa546 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-09-26 17:55:41 +08:00
fit2cloud-chenyw
09b3477b4d style: 调整仪表板tabs组件样式 2021-09-26 17:55:31 +08:00
taojinlong
ae90ed3ab9 fix: ck 时间过滤 2021-09-26 17:54:57 +08:00
fit2cloud-chenyw
38c4bf00b8
Merge pull request #885 from dataease/pr@dev@perf_sso_login 
feat: 完善单点登录
 2021-09-26 16:50:17 +08:00
fit2cloud-chenyw
4f064dc23b feat: 完善单点登录 2021-09-26 16:49:10 +08:00
taojinlong
236c761677 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-09-26 15:13:51 +08:00
taojinlong
2fd77e0dc8 fix: sqlserver 2008 分页问题 2021-09-26 15:13:12 +08:00
fit2cloud-chenyw
75fc0f1cf0 fix: 及时删除oidc错误信息cookie 2021-09-26 13:37:02 +08:00
fit2cloud-chenyw
21939ae1aa fix: 修复oidc缺失信息报错方式 2021-09-26 13:15:22 +08:00
junjie
0335d2327b feat(视图): 增加明细表 2021-09-26 11:28:45 +08:00
fit2cloud-chenyw
97a4c8bd72
Merge pull request #862 from dataease/pr@dev@perf_ldap 
perf: 优化ldap
 2021-09-23 18:43:13 +08:00
fit2cloud-chenyw
b680f091ed perf: 优化ldap 2021-09-23 18:39:56 +08:00
wangjiahao
dba9d42efe feat:仪表板自定义刷新时间 2021-09-23 17:00:13 +08:00
fit2cloud-chenyw
2778d9eb43
Merge branch 'dev' into pr@dev@feat_de_tabs 2021-09-23 15:43:31 +08:00
taojinlong
5a1c68f7fe Merge branch 'dev' into pr@dev@ckes 2021-09-22 18:47:08 +08:00
taojinlong
c19f63590b feat: ck 支持直连模式；es支持 6.* 2021-09-22 18:46:29 +08:00
wangjiahao
3ca7a5e029 fix:修复出现滚动条，样式组件位置定位不准确问题 2021-09-22 18:34:02 +08:00
fit2cloud-chenyw
f81e65aa6f feat: tabs组件 2021-09-22 17:52:53 +08:00
wangjiahao
5e1a37794e refactor:优化图片拖拽进仪表版的展示方式，设置为固定高宽 2021-09-22 17:34:36 +08:00
wangjiahao
1b2115273d feat:编辑仪表板时，外部组件拖拽进仪表板时可以通过附加拖拽阴影区进行预定位 2021-09-22 16:51:41 +08:00
fit2cloud-chenyw
a559cab9fb feat: 全部已读或标记已读实时更新顶部未读数目 2021-09-22 11:03:25 +08:00
wangjiahao
26e2110434 refactor:仪表板矩形，文字组件，间隙等默认样 2021-09-17 17:48:58 +08:00
taojinlong
6907d53306
Merge pull request #826 from dataease/pr@dev@ch 
feat: 支持直连模式（ch）
 2021-09-15 18:26:31 +08:00
XiaJunjie2020
3dad2bfdee
Merge pull request #825 from dataease/pr@dev@fix_custom_calc 
fix: 计算字段不参与关联于制作自定义数据集
 2021-09-15 18:25:03 +08:00
taojinlong
5b86ad0907 refactor: 解决冲突 2021-09-15 18:24:28 +08:00
junjie
d3d12444a1 fix: 计算字段不参与关联于制作自定义数据集 2021-09-15 18:23:58 +08:00
taojinlong
e1b32c6895 feat: 支持直连模式（ch） 2021-09-15 18:20:31 +08:00
王嘉豪
2c8a476a3d
Merge pull request #824 from dataease/pr@dev@refactor_panel-text 
feat:仪表板可以自动进行无限下拉，取消仪表板尺寸设置，统一为自适应
 2021-09-15 18:12:15 +08:00
wangjiahao
f9a0ec3d20 feat:仪表板可以自动进行无限下拉，取消仪表板尺寸设置，统一为自适应 2021-09-15 18:11:05 +08:00
junjie
bb7ef88937 fix: 堆叠项为时间类型错误 2021-09-15 16:59:43 +08:00
fit2cloud-chenyw
9b02fc66b3 fix: 修复 数据没有钻取但地图切换了 2021-09-15 16:39:09 +08:00
fit2cloud-chenyw
c03b82fde4
Merge pull request #813 from dataease/pr@dev@feat_oidc_sso_login 
feat: sso单点登录
 2021-09-14 18:49:21 +08:00
fit2cloud-chenyw
5f20b3fc8f feat: sso单点登录 2021-09-14 18:47:33 +08:00
junjie
89e4ed96ba feat(视图): 尝试接入G2制作视图；增加水波图 2021-09-14 12:32:16 +08:00
fit2cloud-chenyw
ae48fbee41 feat: oidc登录基本功能 2021-09-14 11:34:03 +08:00
junjie
97c5131435 feat: 视图增加组合图 2021-09-13 13:40:04 +08:00
junjie
97e289f4b8 feat(视图): 尝试接入G2制作视图；增加水波图 2021-09-13 11:03:42 +08:00
fit2cloud-chenyw
4930ec17fe feat: 新增oidc配置 2021-09-10 15:52:45 +08:00
wangjiahao
3c13f5c0b4 refactor:仪表板选择目录查询方式时，对应的子目录也显示 2021-09-09 14:55:06 +08:00
wangjiahao
95e6affa75 feat:仪表板支持搜索，同时支持全部和目录两种分类搜索 2021-09-09 14:43:59 +08:00
fit2cloud-chenyw
436fa186e6 feat: 增加ldap的flyway 2021-09-09 11:37:00 +08:00
junjie
b5bb3bf574 feat(视图): 尝试接入G2制作视图；增加水波图 2021-09-08 17:17:24 +08:00
taojinlong
43d0f227e0
Merge pull request #789 from dataease/pr@dev@es 
feat: 支持直连模式（elasticsearch）
 2021-09-08 15:51:01 +08:00
taojinlong
5a6ff503f5 feat: 支持直连模式（elasticsearch） 2021-09-08 15:49:25 +08:00
fit2cloud-chenyw
f2daa5b232
Merge branch 'dev' into pr@dev@feat_ldap 2021-09-08 15:44:34 +08:00
fit2cloud-chenyw
db3e8f6065 feat: 对接ldap基本功能 2021-09-08 15:37:39 +08:00
junjie
a23a7e0a62 feat(视图): 增加明细表 2021-09-08 10:59:19 +08:00
王嘉豪
9c88350986
Merge pull request #786 from dataease/pr@dev@refactor_panel-pdf 
refactor:导出pdf模板支持设置常用参数
 2021-09-07 17:37:57 +08:00
wangjiahao
6a5bfb21cf refactor:导出pdf模板支持设置常用参数 2021-09-07 17:36:43 +08:00
junjie
7c633fd578 feat(视图): 增加明细表 2021-09-07 16:56:33 +08:00
王嘉豪
ac3c093509
Merge pull request #781 from dataease/pr@dev@refactor_panel-pdf 
refactor:PDF导出默认适配横向大屏
 2021-09-07 14:15:26 +08:00
wangjiahao
6054b8b566 refactor:PDF导出默认适配横向大屏 2021-09-07 14:14:24 +08:00
junjie
996185995a refactor(视图)：去除矩形树图图例 2021-09-07 14:08:16 +08:00
fit2cloud-chenyw
b7bcdd1fbf feat: 新增ldap 2021-09-06 18:35:46 +08:00
junjie
62759d2b66 feat(视图): 组合图双y轴 2021-09-06 17:27:59 +08:00
junjie
bcbe24cfe0 feat(视图): 组合图双y轴 2021-09-06 16:58:33 +08:00
junjie
c3315de47d feat(视图): 增加明细表 2021-09-06 14:54:31 +08:00
junjie
53b6510859 feat(视图): 增加明细表 2021-09-06 14:06:10 +08:00
王嘉豪
cec9a85be0
Merge pull request #767 from dataease/pr@dev@refactor_panel-pdf 
feat:仪表板和仪表板分组允许移动
 2021-09-03 18:00:06 +08:00
wangjiahao
d10e4b5ca6 feat:仪表板和仪表板分组允许移动 2021-09-03 17:59:20 +08:00
fit2cloud-chenyw
b68888bc27
Merge branch 'dev' into pr@dev@feat_theme_switch 2021-09-03 14:48:43 +08:00
fit2cloud-chenyw
5ca005b336 feat: 切换主题基本功能 2021-09-03 14:40:47 +08:00
XiaJunjie2020
a90de21b1f
Merge pull request #758 from dataease/pr@dev@feat_axis_value 
feat(视图): 坐标轴轴值设置
 2021-09-03 11:21:46 +08:00
junjie
80d63390d9 feat(视图): 坐标轴轴值设置 2021-09-03 11:20:49 +08:00
wangjiahao
de717cd026 feat:仪表板新增复制功能 2021-09-03 11:19:01 +08:00
wangjiahao
32b8ae4886 feat:仪表板导出支持模板选择功能 2021-09-02 18:59:21 +08:00
fit2cloud-chenyw
ad2e93c63e feat: 尝试增加主题切换功能 2021-09-02 14:28:15 +08:00
junjie
12b192bcfc feat: 组合图 2021-09-01 18:14:03 +08:00
王嘉豪
5edb7dad3c
Merge pull request #744 from dataease/v1.2 
V1.2
 2021-09-01 16:11:02 +08:00
wangjiahao
22e0d8f307 fix:1.重做按钮不生效问题；2.输入文字保存按钮依然是灰的问题 2021-09-01 14:03:55 +08:00
junjie
b9512d9271 refactor: 视图编辑样式优化 2021-09-01 10:18:49 +08:00
junjie
7a3efa6804 feat: 视图增加组合图;折线面积优化 2021-09-01 10:12:24 +08:00
junjie
f8dc9dc9f7 feat: 视图增加组合图 2021-08-31 17:42:26 +08:00
junjie
5b83a779f5 feat: 视图增加组合图 2021-08-31 17:15:20 +08:00
fit2cloud-chenyw
90abc434d4 fix: 个人信息表单中角色信息展示错误 2021-08-31 16:33:45 +08:00
fit2cloud-chenyw
3b05a56aa9 fix: 个人信息表单中角色信息展示错误 2021-08-31 16:28:42 +08:00
fit2cloud-chenyw
efd215cad4 fix: 收藏列表仪表板名称过长展示... 2021-08-31 16:18:43 +08:00
fit2cloud-chenyw
ddd53d9c69 fix: 收藏列表仪表板名称过长展示... 2021-08-31 16:14:34 +08:00
fit2cloud-chenyw
61b2ab2543 feat: 仪表板新增tabs选项卡 2021-08-31 15:57:14 +08:00
fit2cloud-chenyw
09dd11b5b2 refactor: 地图上所有数据为0时 显示灰白色 2021-08-31 12:51:13 +08:00
fit2cloud-chenyw
c89de8719d
Merge pull request #731 from dataease/pr@refactor_empty_map_color 
refactor: 地图上所有数据为0时 显示灰白色
 2021-08-31 12:49:53 +08:00
fit2cloud-chenyw
2c267172c5 refactor: 地图上所有数据为0时 显示灰白色 2021-08-31 12:48:10 +08:00
XiaJunjie2020
067a5979c5
Merge pull request #730 from dataease/pr@v1.2@fix_radar 
fix: 雷达图空数据报错
 2021-08-31 12:45:51 +08:00
junjie
41c5de5f9a fix: 雷达图空数据报错 2021-08-31 12:44:42 +08:00
junjie
9e9c104969 fix: 雷达图空数据报错 2021-08-31 12:43:06 +08:00
taojinlong
70387ead68 feat: 默认去掉数据源参数里首尾空格 2021-08-31 11:52:10 +08:00
taojinlong
816178a4a4 Merge branch 'v1.2' of github.com:dataease/dataease into v1.2 2021-08-31 11:50:14 +08:00
taojinlong
e72b70d45e feat: 默认去掉数据源参数里首尾空格 2021-08-31 11:50:03 +08:00
fit2cloud-chenyw
6b925f73ad fix: 仪表板多个地图resize错误 2021-08-31 11:19:17 +08:00
fit2cloud-chenyw
d0bb428ac1 fix: 仪表板多个地图resize错误 2021-08-31 11:13:31 +08:00
wangjiahao
1fcc794a1c refactor:视图下钻提示优化 2021-08-31 10:29:20 +08:00
taojinlong
a90bc12900 fix: 数据集移动 2021-08-30 16:18:31 +08:00
taojinlong
d303ae90fe fix: 数据集移动 2021-08-30 16:18:03 +08:00
taojinlong
d2674bd472 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-30 15:51:29 +08:00
taojinlong
b2e0089277 fix: 数据集重命名 2021-08-30 15:51:21 +08:00
taojinlong
7dfe9ccf34 fix: 数据集重命名 2021-08-30 15:47:39 +08:00
junjie
5d36a577b4 fix: 颜色选择器去掉清空；矩形树图标签修复；doris 计算字段支持小数 2021-08-27 18:36:58 +08:00
junjie
21af196e17 fix: 颜色选择器去掉清空；矩形树图标签修复；doris 计算字段支持小数 2021-08-27 18:21:02 +08:00
fit2cloud-chenyw
a9123035d7 feat: 完善数据源失效消息 2021-08-27 17:56:10 +08:00
fit2cloud-chenyw
74cc2bb0e1 feat:未读消息列表增加一键全部已读 2021-08-27 13:25:18 +08:00
junjie
7723116d91 refactor: 视图拖拽项样式优化 2021-08-27 11:52:06 +08:00
junjie
571fdb3479 refactor: 视图拖拽项样式优化 2021-08-27 11:49:56 +08:00
taojinlong
ccd53c0f8e feat: 选中即预览数据 2021-08-26 16:49:41 +08:00
taojinlong
f7dbe6f524 feat: 选中即预览数据 2021-08-26 16:49:08 +08:00
taojinlong
fa7484ab87 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-26 12:36:44 +08:00
taojinlong
a466f09441 fix: 数据源高级设置不能编辑 2021-08-26 12:36:29 +08:00
taojinlong
5f0ad8d200 fix: 数据源高级设置不能编辑 2021-08-26 12:35:54 +08:00
wangjiahao
03925e07fe feat:将仪表板导出为pdf 2021-08-26 12:21:52 +08:00
taojinlong
1ba98b57b3 fix: excel 多sheets页面 2021-08-25 18:40:42 +08:00
wangjiahao
01cab0770f refactor:仪表板编辑时，文字组件、矩形组件、过滤组件样式设置面板强制在画布区域内 2021-08-25 17:11:52 +08:00
fit2cloud-chenyw
fab98c0d38
Merge pull request #696 from dataease/pr@dev@fix_表格和文字类型圆角无效 
fix: 表格和视图类型圆角无效
 2021-08-25 15:51:45 +08:00
fit2cloud-chenyw
a4420a22a7 fix: 表格和视图类型圆角无效 2021-08-25 15:49:59 +08:00
taojinlong
596a6ef0bf Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-24 15:03:48 +08:00
taojinlong
e83510f4b7 fix: 数据源校验 2021-08-24 15:03:17 +08:00
junjie
e97c0d8e36 feat: 雷达图大小 2021-08-24 12:02:33 +08:00
fit2cloud-chenyw
c79ea5d87b fix: 创建用户角色列表遮罩组织树 2021-08-23 17:34:43 +08:00
fit2cloud-chenyw
f26adc38c9 fix: 公共链接弹出登录框 2021-08-23 17:23:11 +08:00
taojinlong
4eaaf2273e feat: 校验数据源状态时，同时刷新左侧菜单中数据源的状态 2021-08-23 16:27:05 +08:00
junjie
91d1659b40 fix: 指标卡间隔不生效 2021-08-20 16:49:49 +08:00
junjie
70935f8069 refactor: db数据集增加原表显示 2021-08-19 15:34:44 +08:00
fit2cloud-chenyw
acab3ceb24 feat: 公共链接分享增加短链接 2021-08-19 14:54:32 +08:00
junjie
2e10491c5d refactor: 坐标轴强制显示最小值 2021-08-19 10:46:03 +08:00
junjie
bc2b22a327 refactor: 坐标轴强制显示最大值，scatter横轴优化 2021-08-19 10:43:25 +08:00
junjie
a4cc937575 feat: 矩形树图优化 2021-08-18 18:04:53 +08:00
junjie
3bf998e190 feat: 气泡图优化 2021-08-18 16:33:28 +08:00
junjie
4b2ef13bef feat: 饼图、气泡图优化 2021-08-18 15:43:18 +08:00
fit2cloud-chenyw
8fec4ade4d refactor: 用户列表高级搜索优化 2021-08-18 15:20:30 +08:00
junjie
3b5bb9b17b feat: 字段编辑优化界面显示 2021-08-18 14:01:56 +08:00
王嘉豪
3399d1937a
Merge pull request #654 from dataease/pr@dev@feat_panel-linkage-bar 
refactor:代码回退
 2021-08-18 11:36:42 +08:00
wangjiahao
b34373a549 refactor:代码回退 2021-08-18 11:35:38 +08:00
junjie
0bb6aba1c8 feat: 字段编辑增加引用字段和引用函数说明 2021-08-18 10:28:36 +08:00
王嘉豪
991e5846a1
Merge pull request #649 from dataease/pr@dev@refacotr_drill-message-show 
refactor:仪表板关闭提示文案样式修改
 2021-08-17 17:46:43 +08:00
wangjiahao
7d16d7eab2 refactor:仪表板关闭提示文案样式修改 2021-08-17 17:45:58 +08:00
junjie
13c7c5c8be feat: 散点气泡图轴线样式 2021-08-17 16:02:33 +08:00
王嘉豪
c95d50e93e
Merge pull request #647 from dataease/pr@dev@refacotr_drill-message-show 
refactor:下钻到最后一级提示对应信息
 2021-08-17 15:26:58 +08:00
wangjiahao
effcab3ec4 refactor:下钻到最后一级提示对应信息 2021-08-17 15:26:05 +08:00
fit2cloud-chenyw
bf619698ad
Merge pull request #646 from dataease/pr@dev@feat_view_border 
feat: 视图增加边框圆角配置
 2021-08-17 15:20:37 +08:00
fit2cloud-chenyw
09667df67e feat: 视图增加边框圆角配置 2021-08-17 15:19:36 +08:00
wangjiahao
8e7fe632d9 Merge remote-tracking branch 'origin/dev' into dev 2021-08-17 14:40:24 +08:00
wangjiahao
81a84a54e3 refactor:去除无用代码 2021-08-17 14:40:01 +08:00
junjie
b490c47feb feat: 字段编辑 2021-08-17 14:09:17 +08:00
fit2cloud-chenyw
d2b6fe4356
Merge pull request #642 from dataease/pr@dev@refactor_system_style 
refactor: 优化分享组织树
 2021-08-17 11:09:23 +08:00
fit2cloud-chenyw
d99229dd44 refactor: 优化分享组织树 2021-08-17 11:08:11 +08:00
junjie
9439bcef01 feat: 视图支持简单颜色修改 2021-08-17 10:29:06 +08:00
taojinlong
3a5fbf66ec Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-16 18:32:28 +08:00
taojinlong
7c391ed8cf refactor: 代码格式化 2021-08-16 18:27:20 +08:00
junjie
c7f5ebbd98 feat: 视图支持简单颜色修改 2021-08-16 18:16:55 +08:00
taojinlong
386d15b7e9 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-16 18:05:59 +08:00
taojinlong
d7f363e97b feat: 数据源高级参数设置 2021-08-16 18:05:46 +08:00
fit2cloud-chenyw
a065ffda76 refactor: 优化用户列表样式 2021-08-16 17:36:21 +08:00
junjie
6e1300f937 feat: 视图支持简单颜色修改 2021-08-16 16:34:12 +08:00
junjie
3386b1dd73 feat: 视图支持简单颜色修改 2021-08-16 16:23:57 +08:00
fit2cloud-chenyw
928384c6e2 fix: 组件弹框树节点增加tip 2021-08-16 16:01:55 +08:00
fit2cloud-chenyw
4d5b35b038 fix: 文本列表组件快速检索无效 2021-08-16 15:40:37 +08:00
fit2cloud-chenyw
268db1c0ea
Merge pull request #631 from dataease/pr@dev@fix_下钻地图空白 
fix: axios异步执行导致地图切换错误
 2021-08-16 13:38:22 +08:00
fit2cloud-chenyw
97f9305605 fix: axios异步执行导致地图切换错误 2021-08-16 13:34:23 +08:00
taojinlong
b8f4a819f9 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-16 12:47:35 +08:00
taojinlong
4c8e061e1d feat: 定时检测数据源状态信息 2021-08-16 12:46:34 +08:00
junjie
7bd5f3dc0f fix: 地图code，json 2021-08-16 11:18:48 +08:00
fit2cloud-chenyw
10a4b2cefa fix: 增加下钻方法返回值 2021-08-16 11:03:13 +08:00
junjie
7905c85110 feat: 地图json，区域 2021-08-16 09:56:19 +08:00
王嘉豪
74fff3caf3
Merge pull request #622 from dataease/pr@dev@refactor_drill-toobar 
fix:其他组件图标变小问题
 2021-08-13 17:15:18 +08:00
wangjiahao
ea87c39705 fix:其他组件图标变小问题 2021-08-13 17:14:25 +08:00
taojinlong
19d08770a9 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-13 17:11:15 +08:00
taojinlong
1e67e6669c fix: 解析excel失败 2021-08-13 17:10:59 +08:00
fit2cloud-chenyw
93b2dc8b78 fix: 删除行政区划代码前端缓存 2021-08-13 17:06:24 +08:00
wangjiahao
7f2daa04df refactor:优化下钻，联动弹出窗口 2021-08-13 15:45:43 +08:00
fit2cloud-chenyw
8300139508 fix: 外部链接带密码嵌在iframe 2021-08-13 14:00:12 +08:00
junjie
14f28e8baf feat: 地图颜色 2021-08-13 13:36:10 +08:00
junjie
f96e8a2a88 feat: 地图样式 2021-08-13 12:42:59 +08:00
junjie
cc8587aade refactor: 移除注释 2021-08-13 12:10:36 +08:00
fit2cloud-chenyw
811729e4c6
Merge pull request #612 from dataease/pr@dev@feat_地图联动 
feat: 地图联动
 2021-08-13 11:36:28 +08:00
junjie
15f06584d4 feat: 视图下钻路径 2021-08-13 11:30:15 +08:00
fit2cloud-chenyw
f7699aae6b feat: 地图联动 2021-08-13 11:23:35 +08:00
taojinlong
4632545091 feat: 支持excel多sheet页 2021-08-13 11:23:27 +08:00
taojinlong
b4a09f37dc Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-12 19:23:16 +08:00
taojinlong
4a9009dee1 feat: 支持同时导入excel的多sheet页 2021-08-12 19:23:01 +08:00
fit2cloud-chenyw
49441ace63 feat: 地图缓存 地图联动预留接口 2021-08-12 18:18:37 +08:00
fit2cloud-chenyw
30d70b9d66
Merge branch 'dev' into pr@dev@panal_map_drill 2021-08-12 15:16:10 +08:00
fit2cloud-chenyw
2c5be327b6 feat: 仪表板增加地图下钻上卷 2021-08-12 15:11:57 +08:00
junjie
a8cd74434b feat: 视图下钻 2021-08-12 14:18:04 +08:00
fit2cloud-chenyw
dbf87fb68c
Merge pull request #600 from dataease/pr@dev@feat_map_drill 
feat: 地图增加下钻上卷
 2021-08-12 13:53:19 +08:00
fit2cloud-chenyw
a04262f5ba feat: 地图增加下钻上卷 2021-08-12 13:51:37 +08:00
wangjiahao
d714f146a0 feat:【用户管理】增加根据角色/组织进行查询的支持，增加查看指定用户拥有的所有权限的功能 2021-08-12 11:22:27 +08:00
wangjiahao
d9c7885c88 feat:仪表板视图根据一个视图是否有多事件来确认是否出现弹框，单事件直接触发 2021-08-12 10:15:10 +08:00
wangjiahao
e11d6ff7d9 feat:仪表板视图钻取和联动同时存在时，弹框由用户选择 2021-08-11 17:49:31 +08:00
junjie
85c744f679 feat: 视图上卷 2021-08-11 17:01:51 +08:00
fit2cloud-chenyw
99aac19d46 feat: 包装api接口文档 2021-08-11 14:58:29 +08:00
junjie
b681b21427 feat: 视图下钻 2021-08-11 10:46:32 +08:00
taojinlong
808ac5ed54
Merge pull request #577 from dataease/pr@dev@pg 
feat: 支持 postgresql
 2021-08-10 19:12:22 +08:00
taojinlong
670bc54546 feat: 支持 postgresql 2021-08-10 19:11:14 +08:00
junjie
b2162703d9 feat: 视图返回字段构建 2021-08-10 18:27:11 +08:00
fit2cloud-chenyw
a211b8b765
Merge pull request #572 from dataease/pr@dev@feat_add_xpack_api 
feat: 增加xpack插件内api
 2021-08-10 17:54:21 +08:00
fit2cloud-chenyw
80548698b9 feat: 增加xpack插件内api 2021-08-10 17:51:11 +08:00
junjie
908cf41412 feat: 视图下钻 2021-08-10 17:31:27 +08:00
taojinlong
d9ebc295b4 Merge branch 'dev' into pr@dev@pg 2021-08-10 17:06:57 +08:00
taojinlong
347b64eff2 feat: pg 2021-08-10 17:01:20 +08:00
junjie
affdf3ad00 feat: 视图下钻 2021-08-10 17:00:15 +08:00
junjie
18b68616ac Merge branch 'dev' of /Users/gin/dataease/dataease with conflicts. 2021-08-10 16:13:22 +08:00
wangjiahao
b3c7aa5d16 refactor:仪表版多组件间联动 2021-08-10 15:50:00 +08:00
junjie
20fc994cac feat: 矩形树图 2021-08-10 11:00:38 +08:00
junjie
be0971e965 feat: 散点气泡图 2021-08-09 17:21:35 +08:00
junjie
54e0490279 feat: 限制矩形图指标数量 2021-08-09 16:56:49 +08:00
junjie
64f7b943e4 fix: 删除多余代码 2021-08-09 16:43:47 +08:00
junjie
ed034e59f4 feat: 矩形树图 2021-08-09 16:37:15 +08:00
junjie
f521f2b7a1 refactor: 视图返回参数构建 2021-08-09 13:43:54 +08:00
taojinlong
dcbea29b55 Merge branch 'dev' into pr@dev@sqlserver 2021-08-09 12:45:42 +08:00
junjie
f8980b59e2 refactor: scatter优化 2021-08-06 16:40:48 +08:00
junjie
911573673b feat: 散点图、气泡图 2021-08-06 16:15:59 +08:00
taojinlong
4ec3cdb68d Merge branch 'dev' into pr@dev@sqlserver 2021-08-06 12:25:22 +08:00
taojinlong
c983b661ff feat: sqlserver 2021-08-06 12:19:25 +08:00
taojinlong
74b849d0b9 feat: sqlserver 2021-08-06 10:21:50 +08:00
wangjiahao
3a2bb24ca8 refactor:设置弹出框优化 2021-08-05 16:54:47 +08:00
junjie
5ae6475da7 refactor: 指标卡样式选项优化 2021-08-05 11:19:06 +08:00
junjie
2d9b13570d feat: 视图下钻 2021-08-04 18:07:06 +08:00
王嘉豪
c856d1c91d
Merge branch 'dev' into pr@dev@feat_panel-linkage 2021-08-04 16:54:22 +08:00
wangjiahao
1c91e0e831 feat:仪表板联动增加源联动视图虚化样式，过滤非视图组件等 2021-08-04 16:52:49 +08:00
junjie
68a80e2cc8 feat: 视图钻取 2021-08-04 16:40:53 +08:00
junjie
13576f0d4d refactor: tree菜单位置飘移优化 2021-08-04 11:57:39 +08:00
taojinlong
85059c5cfa Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-04 10:35:18 +08:00
taojinlong
e438d4e1f0 fix: 原始表添加列时，同步失败 2021-08-04 10:34:50 +08:00
taojinlong
e4b16b33c3 fix: 没有经过全量更新不能进行增量更新，并记录日志 2021-08-04 10:34:43 +08:00
taojinlong
225c36230a fix: 查询任务日志 2021-08-04 10:34:41 +08:00
taojinlong
a3defb1a88 feat: 优化任务状态的切换 2021-08-04 10:34:37 +08:00
wangjiahao
f909427422 feat:仪表板联动设置 2021-08-03 18:37:24 +08:00
junjie
8bee21e36a refactor: 堆叠项不允许指标拖入 2021-08-03 17:33:05 +08:00
junjie
cabb266545 refactor: 数据集tree修复 2021-08-03 17:12:48 +08:00
junjie
dc0131ee05 refactor: 去掉多余请求 2021-08-03 16:50:43 +08:00
fit2cloud-chenyw
546152fe27
Merge pull request #501 from dataease/pr@dev@perf_优化地图文件请求速度 
perf: rest请求优化为json文件请求
 2021-08-03 16:06:20 +08:00
fit2cloud-chenyw
1aa5b483fb perf: rest请求优化为json文件请求 2021-08-03 16:05:05 +08:00
junjie
4b039160e3 fix: 字段编辑修复 2021-08-03 14:51:52 +08:00
junjie
bb58d690dc refactor: 编辑字段样式调整 2021-08-03 13:48:14 +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
junjie
e8fa584d47 fix: 雷达图数据结构 2021-08-03 11:50:15 +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
2b0ee551c9 fix: 雷达图tooltip 2021-08-03 11:00:10 +08:00
junjie
ab891386ce feat: 搜索优化 2021-08-02 19:26:28 +08:00
junjie
2772d78e78 fix: 关联字段数据集及时刷新 2021-08-02 18:27:10 +08:00
junjie
15cfbaaea8 feat: 字段支持公式计算 2021-08-02 15:46:12 +08:00
fit2cloud-chenyw
0039a27b92 fix: 去除已读消息搜索 2021-08-02 15:41:28 +08:00
taojinlong
e59864c5ee feat： 优化查询任务日志 2021-08-02 10:08:31 +08:00
taojinlong
4352479850 feat： 优化查询任务日志 2021-08-01 15:12:42 +08:00
junjie
4c5290d87b fix: tree搜索 2021-07-31 16:13:53 +08:00
junjie
cc5a92e3d4 refactor: 视图分组tree优化 2021-07-30 18:45:08 +08:00
junjie
fe4fa7cf50 refactor: 文案修改；视图创建分组默认展开 2021-07-30 18:24:46 +08:00
junjie
97612f1968 refactor: 数据预览接口延长请求时间 2021-07-30 17:44:44 +08:00
taojinlong
4dcfcf604e Merge branch 'dev' of github.com:dataease/dataease into dev 2021-07-30 13:28:47 +08:00
taojinlong
ed55454242 fix: 任务结束后，不允许编辑 2021-07-30 13:28:32 +08:00
junjie
05ab2d576b refactor: 视图样式优化 2021-07-30 12:47:15 +08:00
taojinlong
5da8de3332 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-07-30 12:27:30 +08:00
taojinlong
577fa304f0 fix: 识别 excel 类型 2021-07-30 12:27:14 +08:00
wangjiahao
5ee5bbb2c1 Merge remote-tracking branch 'origin/dev' into dev 2021-07-30 12:13:52 +08:00
wangjiahao
0f6b870d76 refactor:代码回退 2021-07-30 12:13:40 +08:00
fit2cloud-chenyw
ba3b212679 Merge branch 'dev' of fit2cloud:dataease/dataease into dev 2021-07-30 12:06:01 +08:00
fit2cloud-chenyw
ed1fcd7671 fix: 标记已读未记录查看时间 2021-07-30 12:02:39 +08:00
junjie
6cc9cc14e4 refactor: 视图更换数据集优化 2021-07-30 11:54:45 +08:00
wangjiahao
e6beaed195 refactor:仪表板自适应模式下，去掉滚动条 2021-07-30 11:46:43 +08:00
wangjiahao
22ff43afc9 refactor:仪表板名称限制在50字符内 2021-07-30 10:30:31 +08:00
wangjiahao
d641d71753 refactor:优化视图明细导出，导出excel中不需要合计 2021-07-30 10:26:34 +08:00
taojinlong
0ab579b4fe Merge branch 'dev' of github.com:dataease/dataease into dev 2021-07-29 19:22:52 +08:00
taojinlong
b177feef56 fix: 用户信息长度限制 2021-07-29 19:22:32 +08:00
taojinlong
0a0a38c9d7 fix: 任务管理增加权限-> 用户只能管理拥有[管理权限]的数据集的任务 2021-07-29 19:22:29 +08:00
XiaJunjie2020
04624bf657
Merge pull request #418 from dataease/pr@dev@refactor_视图坐标轴标签角度设置调整位置 
refactor: 视图坐标轴标签角度设置位置调整
 2021-07-29 18:20:30 +08:00
junjie
5c8b4f2cff refactor: 视图坐标轴标签角度设置位置调整 2021-07-29 18:18:27 +08:00
fit2cloud-chenyw
261d5fe574 fix: 消息跳转到无权限路由，显示空白 2021-07-29 18:02:59 +08:00
fit2cloud-chenyw
bcd786c48c refactor: 查看分享链接使用独立拦截器 2021-07-29 16:46:17 +08:00
junjie
243dacc959 feat(数据集): 数据集字段支持公式运算等操作（UI和CRUD） 2021-07-29 16:31:49 +08:00
junjie
e0c23d5211 feat(数据集): 数据集字段支持公式运算等操作（UI和CRUD） 2021-07-29 15:56:59 +08:00
junjie
adf5f700f0 fix: 数据集切换页面权限问题 2021-07-29 15:29:25 +08:00
junjie
b99d9e2d8b feat(数据集): 数据集字段支持公式运算等操作（UI和CRUD） 2021-07-29 15:12:29 +08:00
wangjiahao
fdf8ca012d fix:修复普通用户创建视图权限查不到的问题 2021-07-29 15:05:23 +08:00
taojinlong
bfc646d3a3 fix: 页面loading 效果 2021-07-29 14:51:27 +08:00
taojinlong
d02199f44b fix: 消息跳转执行记录也表 2021-07-29 12:34:15 +08:00
taojinlong
86f0791a4f fix: 任务列表上次执行时间与执行记录执行时间不一致 2021-07-29 12:18:29 +08:00
fit2cloud-chenyw
7f2751dcba style: 调整数字区间样式 2021-07-29 11:09:36 +08:00
taojinlong
43c3e56905 fix: 任务 跳转 2021-07-29 00:44:00 +08:00
xiajunjie
36dbcc7976 refactor: 视图纬度指标区分颜色 2021-07-28 22:19:50 +08:00
wangjiahao
e10579cb57 Merge remote-tracking branch 'origin/dev' into dev 2021-07-28 17:47:56 +08:00
wangjiahao
5c98e39451 fix:视图按钮权限控制，同步在仪表板编辑时也适用 2021-07-28 17:47:39 +08:00
taojinlong
7cc006fe4a fix: 修复excel 替换/追加 2021-07-28 16:48:44 +08:00
junjie
d95b995b41 test: 数据集字段编辑测试 2021-07-28 15:23:46 +08:00
fit2cloud-chenyw
4cbb74855e fix: 设置用户名称长度限制 2021-07-28 14:45:32 +08:00
wangjiahao
594d20eb4d refactor:代码格式化 2021-07-28 14:40:22 +08:00
fit2cloud-chenyw
a5d5b658c9
Merge pull request #373 from dataease/pr@dev@feat_地图工具栏 
feat: 增加地图工具栏
 2021-07-28 13:43:36 +08:00
fit2cloud-chenyw
f502c4d656 feat: 增加地图工具栏 2021-07-28 13:42:33 +08:00
junjie
6a8f5511c3 fix: 数据集从编辑切换至添加界面的显示问题 2021-07-28 13:40:38 +08:00
junjie
c6fd782d39 fix: 新建视图后权限问题 2021-07-28 12:16:59 +08:00
junjie
89a7d4b311 fix: 过滤器多条件异常问题；编辑数据集切换到添加数据集界面异常问题 2021-07-28 11:41:06 +08:00
junjie
62301c881d Merge remote-tracking branch 'origin/dev' into dev 2021-07-28 11:39:27 +08:00
junjie
990c6778df fix: 编辑数据集页面切换添加数据集页面异常问题 2021-07-28 11:37:41 +08:00
wangjiahao
09d6ae7396 reactor:去掉无用的日志等 2021-07-28 11:36:51 +08:00
junjie
f7132e9e71 fix: 数据集切换页面权限问题 2021-07-27 19:19:35 +08:00
junjie
f952c1f0f1 fix: 数据集切换界面权限问题 2021-07-27 19:13:22 +08:00
XiaJunjie2020
e1ce57c154
Merge pull request #357 from dataease/pr@dev@fix_数据集预览翻页不显示数据；国际化 
fix: 数据集翻页不显示数据；国际化
 2021-07-27 18:14:00 +08:00
junjie
50c8def3ab fix: 数据集翻页不显示数据；国际化 2021-07-27 18:11:49 +08:00
fit2cloud-chenyw
c805f28089 perf: 地图坐标json使用缓存 2021-07-27 18:03:56 +08:00
junjie
af67336b42 refactor: 字段编辑UI优化 2021-07-27 17:26:41 +08:00
junjie
35a7da380b feat: 字段管理多处优化，初步完成字段公式编辑前端UI 2021-07-27 16:58:03 +08:00
fit2cloud-chenyw
3c5002443f fix: 过滤组件弹框回显问题 2021-07-27 16:50:56 +08:00
taojinlong
157a961d94 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-07-27 16:40:25 +08:00
taojinlong
8adb9dcbe2 feat: 选择“数据库Schema”的地方加个搜索 2021-07-27 16:39:57 +08:00
wangjiahao
27328e9f45 refactor:重构仪表板主题设置组件，适配视图样式设置相关变化 2021-07-27 16:23:06 +08:00
taojinlong
1d55507388
Merge branch 'dev' into pr@dev@task 2021-07-27 16:09:41 +08:00
taojinlong
585755a37a fix: 更新任务状态 2021-07-27 16:07:03 +08:00
fit2cloud-chenyw
6718d15cf0 fix: 跳转任务消息延时 2021-07-27 12:30:29 +08:00
fit2cloud-chenyw
e03b2894ea fix: 删除未读消息列选择器 2021-07-27 10:35:38 +08:00
fit2cloud-chenyw
1e33054903 feat: everyone默认订阅仪表板分享、任务失败消息通知 2021-07-26 21:37:08 +08:00
junjie
51e1856411 refactor: 全局滚动条样式调整，字段编辑样式调整 2021-07-26 16:45:11 +08:00
junjie
67f5160312 refactor: 数据集字段将维度指标分类展示，后续维度和指标具有不同的操作，为配置钻取目录、字段计算做前置准备 2021-07-26 16:08:14 +08:00
fit2cloud-chenyw
43f038ab65
Merge pull request #335 from dataease/pr@dev@feat_过滤组件下拉列表 
feat: 增加过滤组件下拉列表
 2021-07-26 15:16:36 +08:00
fit2cloud-chenyw
9890d02e6c feat: 增加过滤组件下拉列表 2021-07-26 15:05:26 +08:00
junjie
482f06bf76 fix: 视图缩放 2021-07-26 14:22:19 +08:00
junjie
3671a33984 refactor: 视图缩放暂时去掉 2021-07-26 14:00:45 +08:00
junjie
c0870cc0ea fix: 视图表格组件高度问题 2021-07-26 11:15:48 +08:00
junjie
078a0f5b58 refactor: 维度指标色彩区分 2021-07-24 10:19:24 +08:00
junjie
d3b7dfc19b refactor: 视图字段拖拽区增加placeholder 2021-07-24 10:06:16 +08:00
taojinlong
d324ff8c6e fix: 更新任务状态 2021-07-23 18:37:56 +08:00
junjie
99b2ac0c7a refactor: 视图拖拽块增加placeholder 2021-07-23 17:02:50 +08:00
wangjiahao
1826a7025b fix:【仪表板】同一张图片无法连续两次被导入到仪表盘 2021-07-23 15:35:38 +08:00
junjie
0e56bea06f refactor: 视图拖拽块增加placeholder 2021-07-23 14:42:15 +08:00
wangjiahao
35c9802381 Merge remote-tracking branch 'origin/dev' into fix_panel_edit_attr-auto-save 
# Conflicts:
#	frontend/src/components/canvas/components/RectangleAttr.vue
#	frontend/src/views/Tinymce/RectangleAttr.vue
#	frontend/src/views/system/task/TaskRecord.vue
#	frontend/src/views/system/task/dataset.vue
 2021-07-23 14:00:28 +08:00
wangjiahao
a2425538fa Merge remote-tracking branch 'origin/dev' into fix_panel_edit_attr-auto-save 
# Conflicts:
#	frontend/src/components/canvas/components/RectangleAttr.vue
 2021-07-23 13:58:13 +08:00
wangjiahao
e09e352f46 feat:组件样式修改时可以延迟保存组件镜像 2021-07-23 13:45:01 +08:00
fit2cloud-chenyw
f40073a8ca fix: 消息跳转到同步任务记录后加载有延时 2021-07-23 13:35:27 +08:00
taojinlong
0415c14c51 feat: 更改历史任务状态 2021-07-23 11:32:09 +08:00
wangjiahao
b2ea0c7123 fix:修复编辑过滤组件时，悬浮组件依然在遮罩上方 2021-07-23 11:30:33 +08:00
taojinlong
4b2f68b484 feat: 调整定时任务 2021-07-23 10:54:44 +08:00
fit2cloud-chenyw
eb6b190d4f fix: 修复跳转后菜单不打开 2021-07-23 10:47:30 +08:00
fit2cloud-chenyw
409e5a1e82 fix: 完善数据集消息任务跳转 2021-07-23 10:47:24 +08:00
fit2cloud-chenyw
4b4bd65065 fix: 数据集消息任务跳转 2021-07-23 10:47:13 +08:00
fit2cloud-chenyw
14a58ac561 fix: 1.类型拍戏报错 
2.分页数据错误
     3.全部消息取消默认状态排序
     4.数据集同步消息跳转路由修改
 2021-07-23 10:47:06 +08:00
junjie
e73d004fd8 fix: 视图中数据集字段 2021-07-23 10:44:48 +08:00
junjie
30c00ec79a fix: 视图中数据集字段获取 2021-07-23 10:21:22 +08:00
junjie
b7936b91f9 fix: 视图中数据集权限校验 2021-07-22 18:59:36 +08:00
fit2cloud-chenyw
06e1fbde14
Merge pull request #296 from dataease/pr@dev@fix_数据集消息跳转 
fix: 修复跳转后菜单不打开
 2021-07-22 18:36:53 +08:00
fit2cloud-chenyw
c7c1ac02e8 fix: 修复跳转后菜单不打开 2021-07-22 18:34:27 +08:00
junjie
f11bb8305d refactor: 颜色选择器更换element自带组件 2021-07-22 18:31:18 +08:00
junjie
6903d30de0 fix: 数据集权限问题导致视图没有字段 2021-07-22 18:23:33 +08:00
junjie
f2ac1b6a6c refactor: 视图样式界面优化 2021-07-22 18:20:44 +08:00
fit2cloud-chenyw
deaf1aa3a9 fix: 完善数据集消息任务跳转 2021-07-22 18:08:39 +08:00
fit2cloud-chenyw
c3af183fdb fix: 数据集消息任务跳转 2021-07-22 17:27:49 +08:00
fit2cloud-chenyw
aaf9f958a0 fix: 1.类型拍戏报错 
2.分页数据错误
     3.全部消息取消默认状态排序
     4.数据集同步消息跳转路由修改
 2021-07-22 16:59:34 +08:00
XiaJunjie2020
e2051479bd
Merge pull request #286 from dataease/pr@dev@refactor_坐标轴图表滚轮缩放优化 
refactor: 坐标轴图表滚轮缩放优化
 2021-07-22 16:20:09 +08:00
王嘉豪
7e12879de5
Merge pull request #288 from dataease/pr@dev@fix_panel_other-component 
fix:修复编辑过滤组件时，悬浮组件依然在遮罩上方
 2021-07-22 16:19:53 +08:00
wangjiahao
2e7e958b2f fix:修复编辑过滤组件时，悬浮组件依然在遮罩上方 2021-07-22 16:18:07 +08:00
fit2cloud-chenyw
d3494ea3cb fix: 仪表板过滤组件国际化 2021-07-22 15:27:44 +08:00
junjie
f85db005e1 refactor: 坐标轴图表滚轮缩放优化 2021-07-22 15:00:01 +08:00
fit2cloud-chenyw
9582bed910
Merge pull request #284 from dataease/pr@dev@feat_仪表板数值区间组件 
feat: 仪表板过滤组件数值区间
 2021-07-22 13:59:20 +08:00
fit2cloud-chenyw
f9bfbd93e8 feat: 仪表板过滤组件数值区间 2021-07-22 13:56:28 +08:00
junjie
c7450f65c6 fix: 视图样式 2021-07-22 12:26:22 +08:00
junjie
acace5e57d refactor: 视图样式调整 2021-07-22 12:07:17 +08:00
junjie
4087b60366 fix: 视图样式 2021-07-22 11:02:33 +08:00
junjie
fa257167e6 refactor: 界面样式调整 2021-07-22 10:49:23 +08:00
wangjiahao
5f95db6a53 Merge remote-tracking branch 'origin/dev' into dev 2021-07-22 10:02:31 +08:00
wangjiahao
ad1b829356 fix:Mac M1 arm64 chrome浏览器版本适配，修复仪表板编辑是全屏模式可能出现滚动条问题 2021-07-22 10:02:17 +08:00
junjie
ee0ecadfcb fix: 堆叠bug修复 2021-07-21 18:57:16 +08:00
junjie
3a8adf4023 feat: 视图字段排序增加icon标识 2021-07-21 18:17:30 +08:00
junjie
a8e6e2d0e1 feat: 堆叠图支持堆叠项 2021-07-21 17:36:50 +08:00
fit2cloud-chenyw
5715563714 feat: 替换缩略图 2021-07-21 17:23:58 +08:00
fit2cloud-chenyw
f0a2532b51 feat: 视图图表类型增加地图 2021-07-21 17:12:40 +08:00
junjie
694022ad71 feat: 视图维度指标拖动区域文案细节优化 2021-07-20 13:35:48 +08:00
junjie
7411ba40da feat: 视图过滤重新设计，支持单维度指标展示 2021-07-20 12:16:37 +08:00
junjie
c429821c5c feat: 过滤组件条件调整,视图界面调整 2021-07-19 16:04:51 +08:00
junjie
7957ac5a40 feat: 过滤组件条件调整 2021-07-19 15:47:23 +08:00
junjie
5c4bb9f7c5 refactor: 视图UI布局初步调整 2021-07-19 12:36:25 +08:00
wangjiahao
a42e37aa47 fix:仪表板Mac M1版电脑保存模板时失败的问题 2021-07-16 17:55:00 +08:00
junjie
e787aa235e fix: tree搜索后无法折叠 2021-07-16 14:59:01 +08:00
junjie
4f37bda3f8 feat: 更换数据集确认按钮调整 2021-07-16 12:42:04 +08:00
junjie
7596debca6 feat: 视图增加默认padding 2021-07-15 18:30:16 +08:00
王嘉豪
5c15ac930f
Merge pull request #246 from dataease/pr@dev@panel 
feat:增加过滤组件标题样式设置
 2021-07-15 16:32:13 +08:00
wangjiahao
f9695bbe8d feat:增加过滤组件标题样式设置 2021-07-15 16:22:42 +08:00
fit2cloud-chenyw
ad20039851 fix: 过滤组件弹框样式错位 2021-07-15 15:11:17 +08:00
junjie
9c6c162e67 feat: 同数据源直连数据集之间支持数据关联 2021-07-15 14:37:01 +08:00
taojinlong
a4c7527a99
Merge pull request #243 from dataease/pr@dev@errorlog 
fix: 抽取数据的错误日志
 2021-07-15 11:32:45 +08:00
taojinlong
f527eefef0 fix: 抽取数据的错误日志 2021-07-15 11:30:40 +08:00
junjie
a68323de2f feat: 同数据源直连数据集之间支持数据关联 2021-07-15 11:05:11 +08:00
wangjiahao
f35cbc166b fix:仪表板全屏预览过滤组件下拉框不显示问题 2021-07-15 09:57:10 +08:00
fit2cloud-chenyw
dfd0f04698 feat: 仪表板条件过滤组件增加标题 2021-07-14 16:58:07 +08:00
王嘉豪
a10d4372c9
Merge pull request #234 from dataease/pr@dev@panel 
feat:创建分组或者仪表板时，点击取消按钮，不发出目录树的请求
 2021-07-14 10:55:28 +08:00
wangjiahao
39d5ea5aa5 feat:创建分组或者仪表板时，点击取消按钮，不发出目录树的请求 2021-07-14 10:53:47 +08:00
fit2cloud-chenyw
84808a6e96 feat: 添加测试地图 2021-07-13 18:44:33 +08:00
taojinlong
e42b8b73ab fix: 执行记录状态修改；执行记录显示错误；简单执行增加描述 2021-07-13 18:34:17 +08:00
junjie
54820d6746 feat: 数据关联改为左连接等方式 2021-07-13 15:55:22 +08:00
junjie
ccd07cc85a feat: excel上传后可编辑字段类型再保存 2021-07-13 12:32:20 +08:00
junjie
4f9abf5af6 fix: 数据集编辑后空白 2021-07-12 19:27:34 +08:00
junjie
131eb3e353 fix: 数据集字段浮点转整型 2021-07-12 18:57:51 +08:00
王嘉豪
b75d9b1eda
Merge pull request #216 from dataease/pr@dev@panel 
Pr@dev@panel
 2021-07-12 17:59:30 +08:00
wangjiahao
4151f17609 fix:保存模板部分浏览器出现堆栈超出的情况，降低一下截图图片质量 2021-07-12 17:50:33 +08:00
taojinlong
9060a789f0
Merge pull request #215 from dataease/pr@dev@check-excel-columns 
feat: 追加/更新 excel 数据集时，列名与原数据集保持一致
 2021-07-12 17:25:33 +08:00
taojinlong
48ed621854 feat: 追加/更新 excel 数据集时，列名与原数据集保持一致 2021-07-12 17:24:35 +08:00
junjie
ad23936022 refactor: SQL拼接 2021-07-12 16:35:03 +08:00
fit2cloud-chenyw
7b993b609a fix: 中文输入法回车键直接保存 2021-07-12 15:15:19 +08:00
taojinlong
f8e2c53e85
Merge branch 'dev' into pr@dev@errormsg 2021-07-12 11:49:45 +08:00
taojinlong
fd7d70e86a feat(错误信息): 抽取数据的错误信息仅显示错误基本描述 2021-07-12 11:47:26 +08:00
fit2cloud-chenyw
8a5ccbb26b
Merge pull request #203 from dataease/pr@dev@feat_消息设置 
feat: 增加消息接收设置
 2021-07-12 11:42:59 +08:00
fit2cloud-chenyw
b329f894d1 feat: 完善消息接收设置 2021-07-12 11:30:57 +08:00
fit2cloud-chenyw
ff82cffff4 feat: 增加消息接收设置 2021-07-09 18:37:07 +08:00
wangjiahao
6e17a5f4a2 Merge remote-tracking branch 'origin/dev' into pr@dev@panel 
# Conflicts:
#	frontend/src/lang/en.js
#	frontend/src/lang/tw.js
#	frontend/src/lang/zh.js
 2021-07-09 16:48:24 +08:00
wangjiahao
05caadb0fe feat:【仪表盘】可支持查看仪表盘中图表的明细数据，在查看窗口可下载明细数据 2021-07-09 16:44:36 +08:00
taojinlong
7b345b400f
Merge pull request #192 from dataease/pr@dev@simple-repeat 
feat(數據集): 数据集任务，增加简单重复执行的功能
 2021-07-09 10:53:21 +08:00
taojinlong
d1174fed5c feat(數據集): 数据集任务，增加简单重复执行的功能 2021-07-09 10:52:20 +08:00
junjie
7c9c690c5d feat: 视图颜色增加多种配色方案 2021-07-08 18:29:26 +08:00
taojinlong
7f388f1edd feat(數據集): 添加非直连数据集時，默认全量同步一次 2021-07-08 15:11:56 +08:00
taojinlong
d3cc82d59f fix: 代码冲突 2021-07-08 15:07:39 +08:00
taojinlong
cd4806ac3a feat(數據集): 添加非直连数据集時，默认全量同步一次 2021-07-08 15:05:25 +08:00
taojinlong
83b56beeb4
Merge branch 'dev' into pr@dev@taskmgm 2021-07-08 14:17:00 +08:00
taojinlong
00202fa718 feat: 任务管理 2021-07-08 14:11:59 +08:00
taojinlong
3af3e5798c feat: 任务管理 2021-07-08 14:00:06 +08:00
junjie
acaf405131 feat: 数据集编辑字段，增加维度指标选项，而非老版本中通过字段类型判定 2021-07-08 13:50:22 +08:00
taojinlong
5721088ec3 fix(數據源): 校驗 oracle schema 2021-07-08 09:54:08 +08:00
taojinlong
3707ca5adb feat(国际化): 任务管理 2021-07-08 09:14:55 +08:00
王嘉豪
66760cdf9a
Merge pull request #178 from dataease/pr@dev@panel 
fix:矩形组件和文本组件在非自适应画布区域的模式下对应悬浮组件定位问题
 2021-07-07 19:10:30 +08:00
wangjiahao
88f5e25e39 fix:矩形组件和文本组件在非自适应画布区域的模式下对应悬浮组件定位问题 2021-07-07 19:09:28 +08:00
王嘉豪
00a6cac95c
Merge pull request #174 from dataease/pr@dev@panel 
refactor:删除多余的代码
 2021-07-07 16:10:52 +08:00
wangjiahao
eaa730ee13 refactor:删除多余的代码 2021-07-07 16:09:13 +08:00
王嘉豪
b4b3ad3a86
Merge pull request #173 from dataease/pr@dev@panel 
Pr@dev@panel
 2021-07-07 14:16:37 +08:00
wangjiahao
036bc45b6b fix: 【仪表板】仪表板收藏后再取消，仪表板显示为空 2021-07-07 14:13:13 +08:00
wangjiahao
24c5581def fix: 【仪表板】仪表板收藏后再取消，仪表板显示为空 2021-07-07 12:44:59 +08:00
junjie
73b9e82042 feat: 视图数据集权限控制 2021-07-07 11:06:53 +08:00
junjie
cc14b0f3be feat: 视图数据集权限控制 2021-07-06 19:26:15 +08:00
wangjiahao
c05e4b842d Merge remote-tracking branch 'origin/dev' into pr@dev@panel 
# Conflicts:
#	frontend/src/views/chart/view/ChartEdit.vue
 2021-07-06 18:46:54 +08:00
wangjiahao
4b11bfeb72 feat: 仪表板编辑增加新建视图功能，可以直接在仪表板新建视图 2021-07-06 18:34:01 +08:00
junjie
77f5414125 feat: 同步数据集预览数据从doris中取 2021-07-06 16:32:38 +08:00
fit2cloud-chenyw
b8ae6a36f7 fix:修复组件查询条件无效 2021-07-06 16:22:19 +08:00
fit2cloud-chenyw
f64e8cabba
Merge pull request #160 from dataease/pr@dev@feat_消息提醒继续完善 
feat: 继续完善消息提醒
 2021-07-06 15:29:03 +08:00
fit2cloud-chenyw
0fc1c742a5 feat: 继续完善消息提醒 2021-07-06 15:24:34 +08:00
junjie
33d6ea2439 feat: 视图维度指标增加快速搜索；视图界面可以编辑数据集字段 2021-07-06 12:30:48 +08:00
junjie
df0c0b8777 feat: 视图过滤增加包含与不包含 2021-07-06 11:01:08 +08:00
fit2cloud-chenyw
46ca995ec1
Merge pull request #149 from dataease/pr@dev@feat_完善消息 
feat: 完善分享消息
 2021-07-06 09:38:23 +08:00
fit2cloud-chenyw
8f2f6f1670 feat: 完善分享消息 2021-07-05 18:18:06 +08:00
junjie
8f0eeaff19 fix: 视图过滤不能设置无限制 2021-07-05 17:24:23 +08:00
junjie
141e146909 feat: radar支持轴线样式设置 2021-07-05 13:57:10 +08:00
taojinlong
f055d97488
Merge pull request #142 from dataease/pr@dev@oracle 
feat(数据源): 添加oracle 数据源时，指定schema
 2021-07-05 12:18:07 +08:00
taojinlong
6ce1adf57a feat(数据源): 添加oracle 数据源时，指定schema 2021-07-05 12:17:16 +08:00
fit2cloud-chenyw
4c422b9cd4
Merge branch 'dev' into pr@dev@feat_message-center 2021-07-03 19:17:59 +08:00
fit2cloud-chenyw
dadeb745b4 feat: 增加数据集同步消息提醒 2021-07-03 18:01:30 +08:00
junjie
515e43294f fix: 视图表格组件高度自适应 2021-07-03 14:50:07 +08:00
fit2cloud-chenyw
25203a6bb8 feat: 消息中心 2021-07-02 19:19:38 +08:00
王嘉豪
a78c92fd9b
Merge pull request #137 from dataease/pr@dev@wjh 
fix: 修复文本悬浮样式组件样式穿透未生效问题
 2021-07-02 14:53:18 +08:00
wangjiahao
af4e8e9593 fix: 修复文本悬浮样式组件样式穿透未生效问题 2021-07-02 14:51:50 +08:00
王嘉豪
d8a0c158a4
Merge pull request #136 from dataease/pr@dev@wjh 
feat(panel): 文件组件拖拽是样式编辑改为悬浮式设计，在编辑仪表板是可以看到实时的效果
 2021-07-02 14:27:48 +08:00
wangjiahao
1d316804e0 feat(panel): 文件组件拖拽是样式编辑改为悬浮式设计，在编辑仪表板是可以看到实时的效果 2021-07-02 14:25:12 +08:00
junjie
2087b402b7 feat: 饼图标签增加引导线设置 2021-07-02 11:19:23 +08:00
王嘉豪
db6f010558
Merge pull request #133 from dataease/pr@dev@wjh 
Pr@dev@wjh
 2021-07-01 18:51:11 +08:00
wangjiahao
995b9ea178 feat: 1.矩形组件编辑样式修改为悬浮式设计，设计框可以根据矩形组件移动；2.增加矩形组件风格选项 3.变更新建矩形组件默认参数 2021-07-01 18:47:53 +08:00
junjie
7a281e8e49 feat: 视图坐标轴设置增加属性设置 2021-07-01 18:30:41 +08:00
junjie
544f4d8a2c feat: 视图坐标轴设置增加属性设置 2021-07-01 18:27:26 +08:00
taojinlong
652964a24c
Merge pull request #127 from dataease/pr@dev@oracle 
feat: 显示 oracle 分类
 2021-07-01 15:14:09 +08:00
taojinlong
988064dd89 feat: 显示 oracle 分类 2021-07-01 15:08:57 +08:00
王嘉豪
00021d6286
Merge pull request #122 from dataease/pr@dev@wjh 
fix: 修复部分开发环境仪表板编辑无法拖拽问题
 2021-07-01 12:39:20 +08:00
taojinlong
9b7fa951d7 Merge branch 'dev' into pr@dev@oracle 2021-07-01 12:30:25 +08:00
wangjiahao
0d9338a51d fix: 修复部分开发环境仪表板编辑无法拖拽问题 2021-07-01 12:27:16 +08:00
王嘉豪
32572b87e3
Merge pull request #120 from dataease/pr@dev@wjh 
Pr@dev@wjh
 2021-07-01 12:23:36 +08:00
wangjiahao
83a58b6f07 feat: 仪表板增加富文本编辑 2021-07-01 12:12:43 +08:00
junjie
a927e4368f refactor: 前端tree组件以及拉宽线优化 2021-07-01 10:47:28 +08:00
junjie
48c7a47b00 feat: 更换数据集提示优化；横、纵轴字体增加选项；视图选择数据集tree增加搜索 2021-06-30 18:13:36 +08:00
taojinlong
43ee00d701 Merge branch 'dev' into pr@dev@oracle 2021-06-30 14:02:18 +08:00
junjie
2024d88a5e refactor: 视图表格组件，渲染速度优化 2021-06-30 12:42:09 +08:00
taojinlong
b57e71cee6 Merge branch 'dev' into pr@dev@oracle 2021-06-30 10:53:08 +08:00
junjie
75d405631a fix: 视图tree支持重命名 2021-06-30 10:40:11 +08:00
taojinlong
69321b08a0 支持oracle 2021-06-30 10:11:12 +08:00
junjie
c6b3dac3d5 feat(视图): 支持视图更换数据集 2021-06-29 14:48:59 +08:00
junjie
50c544fb47 feat(视图): 标题增加字体样式 2021-06-29 12:09:37 +08:00
junjie
f098f651ca feat: 轴线支持线条和标签设置 2021-06-28 18:03:33 +08:00
junjie
8602db5e18 fix: 数据集编辑时，不支持修改连接方式 2021-06-28 16:43:25 +08:00
junjie
99fcfe29c1 feat: 视图表格组件，表头 表格支持行高修改 2021-06-28 16:21:54 +08:00
junjie
a0565d96ee feat: 数据关联选择数据集tree优化 2021-06-28 16:21:07 +08:00
junjie
42325c6568 fix: 自定义sql中出现count(*)等函数导致数据查询异常bug修复；doris查询 排序 过滤冲突sql修复 2021-06-28 13:53:10 +08:00
junjie
9f8ef33647 fix: 增加excel字段重复错误提示 2021-06-28 13:50:53 +08:00
fit2cloud-chenyw
a9aab687d3 fix: 表格查询组件对繁体国际化的支持 2021-06-28 11:30:42 +08:00
fit2cloud-chenyw
12807ebac2 fix: 复制公共链接提示 2021-06-25 17:06:47 +08:00
fit2cloud-chenyw
73f45d9d09 fix: 修复个人信息、修改密码刷新后左侧留白；表单过大。 2021-06-25 16:52:40 +08:00
wangjiahao
c5fc275c77 Merge remote-tracking branch 'origin/main' into main 2021-06-25 14:41:00 +08:00
wangjiahao
8926ecbebc fix: 新建仪表板时，来回切换新建仪表板和复用仪表板再保存报错问题 2021-06-25 14:28:27 +08:00
fit2cloud-chenyw
b717b406b2 fix: 仪表盘分享公共连接地址为localhost，无法访问 2021-06-25 14:05:36 +08:00
taojinlong
0142ec49e5 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-25 12:44:17 +08:00
taojinlong
47600403a8 feat: 取掉sqlserver 2021-06-25 12:44:05 +08:00
junjie
898062ae9b fix: 前端tree搜索,高度调整 2021-06-24 18:53:47 +08:00
fit2cloud-chenyw
256c0efe6b fix: 用户管理删除组织会闪现0(null) 2021-06-24 18:34:05 +08:00
junjie
99bd4727ed fix: 前端tree搜索；name修复 2021-06-24 18:21:59 +08:00
wangjiahao
ff6baf8a93 Merge remote-tracking branch 'origin/main' into main 2021-06-24 18:20:51 +08:00
wangjiahao
068a24060e fix: 切换收藏 仪表板依然高亮问题 2021-06-24 18:20:41 +08:00
junjie
765ca37015 Merge remote-tracking branch 'origin/main' into main 2021-06-24 17:51:55 +08:00
junjie
abdf3ab28b fix: 数据源类型保持一致 2021-06-24 17:51:45 +08:00
fit2cloud-chenyw
214f3db8fd feat: 个人信息、修改密码、关于风格统一 2021-06-24 17:51:24 +08:00
junjie
1ea046b637 fix: 数据集tree高度支持参数控制 2021-06-24 17:13:46 +08:00
taojinlong
7be1cde788 feat: 提示字体大小 2021-06-24 16:49:01 +08:00
junjie
39cfec5080 fix:login logo图片fix 2021-06-24 16:32:23 +08:00
taojinlong
61b31f5733 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-24 16:28:15 +08:00
taojinlong
d5bdeab740 feat: 登陆提示 2021-06-24 16:28:07 +08:00
fit2cloud-chenyw
15349817b6 fix: 修复仪表板查询组件是日期样式 2021-06-24 16:08:21 +08:00
junjie
2ae993c07d fix:折线图默认tooltip提示触发修改 2021-06-24 15:18:19 +08:00
fit2cloud-chenyw
a5c7458904 feat: 修改eslint验证规则 2021-06-24 14:43:52 +08:00
fit2cloud-chenyw
74006adc20 feat: 增加忽略eslient扫描注释 2021-06-24 14:31:01 +08:00
junjie
ce4d20b8b1 fix:代码规范 2021-06-24 13:57:36 +08:00
junjie
09aaaedeb4 fix:代码规范 2021-06-24 13:54:58 +08:00
fit2cloud-chenyw
70e9850968 fix: 公共链接分享密码页面增加表单验证 2021-06-24 12:35:26 +08:00
wangjiahao
66cb80c5fc feat: 增加默认主题 2021-06-24 12:21:34 +08:00
wangjiahao
2580dab0a8 Merge remote-tracking branch 'origin/main' into main 2021-06-24 12:08:54 +08:00
wangjiahao
4f589600e6 fix: 清空仪表板 会导致样式错误问题 2021-06-24 12:08:42 +08:00
fit2cloud-chenyw
a7c66485eb feat:用户管理 设置admin的状态不可修改 2021-06-24 11:14:45 +08:00
junjie
9321291c6b Merge remote-tracking branch 'origin/main' into main 2021-06-24 11:10:06 +08:00
junjie
060bb7621b fix:颜色选择器弹出位置优化 2021-06-24 11:09:53 +08:00
fit2cloud-chenyw
4cfa5e9bea feat: 数据源新增按类型添加 2021-06-24 11:09:07 +08:00
fit2cloud-chenyw
35780b47bb fix: 修复登录以及首页logo图片闪烁 2021-06-24 11:08:28 +08:00
junjie
17a6983924 fix:数据源分组名称保持统一 2021-06-23 18:59:14 +08:00
wangjiahao
a19bbf0f8f Merge remote-tracking branch 'origin/main' into main 2021-06-23 18:03:32 +08:00
wangjiahao
474ae7bf04 fix: 调整主题设置顺序 2021-06-23 18:03:20 +08:00
junjie
1663560f90 fix:视图结果过滤器条件增加容错；数据集tree重命名、删除后，右侧界面优化 2021-06-23 17:44:47 +08:00
wangjiahao
d8983a9547 Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java
 2021-06-23 17:40:41 +08:00
wangjiahao
c07462bd55 fix: 修复更新xpack菜单 事务失效问题 2021-06-23 17:40:21 +08:00
fit2cloud-chenyw
83d0bad930 feat: 数据源树删除类型上的新增操作 2021-06-23 17:17:50 +08:00
junjie
849ee614be fix:添加数据源，form表单中校验、保存不做权限控制，权限是在创建按钮上控制 2021-06-23 16:29:31 +08:00
wangjiahao
5ba240b781 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-23 16:17:57 +08:00
wangjiahao
9bb24a13c2 fix: 修复主题变更 图形属性不联动问题 2021-06-23 16:17:37 +08:00
junjie
5cb0267304 fix:创建用户表单，性别、状态、组织支持重置 2021-06-23 15:56:04 +08:00
junjie
33a221dc30 fix:模版分类名称长度限制50 2021-06-23 15:43:54 +08:00
wangjiahao
9cf6919b2e Merge remote-tracking branch 'origin/main' into main 2021-06-23 15:28:22 +08:00
wangjiahao
4d26122532 feat(fix): 增加删除目录权限校验 增加数据源权限控制 2021-06-23 15:28:06 +08:00
junjie
c48a0760ce feat(fix):前端去掉控制台打印 2021-06-23 11:31:33 +08:00
fit2cloud-chenyw
d2459b4408 fix: 【ID1004552】【用户管理】编辑用户无法删除组织 2021-06-23 11:30:03 +08:00
junjie
9b0f9b21bd feat(fix):数据集、视图优化 2021-06-22 17:21:50 +08:00
fit2cloud-chenyw
d73f55e6e6 feat: 仪表板查询组件增加快速检索功能 2021-06-22 16:29:43 +08:00
fit2cloud-chenyw
63ff02c462 feat: 删除强制debugger 2021-06-22 14:41:47 +08:00
fit2cloud-chenyw
4b055dc2fc feat: 仪表板查询组件适配 ‘删除场景’ 2021-06-22 14:40:00 +08:00
wangjiahao
aa38a4be51 feat: 合并重复样式数据 2021-06-22 14:14:31 +08:00
fit2cloud-chenyw
dfaa7e089d feat: 修改收藏列表的删除按钮图标 2021-06-22 12:01:46 +08:00
fit2cloud-chenyw
a60bc5c056 feat: 【ID1001685】【数据源】预览数据源信息的时候，点击预览页下方的编辑按钮进行编辑 2021-06-22 11:54:53 +08:00
wangjiahao
a205bf46f5 Merge remote-tracking branch 'origin/main' into main 2021-06-22 11:26:35 +08:00
wangjiahao
76162f1461 fix: 仪表盘样式设置 回显不准确问题 2021-06-22 11:25:59 +08:00
fit2cloud-chenyw
ada29f7194 feat: 数据源样式与数据集统一 2021-06-22 11:19:58 +08:00
junjie
56b5206984 feat(fix):数据集、视图分组增加搜索 2021-06-21 17:28:12 +08:00
wangjiahao
f155f3d799 Merge remote-tracking branch 'origin/main' into main 2021-06-21 17:17:51 +08:00
wangjiahao
a80e5d9e72 fix: 拖拽问题回退 2021-06-21 17:17:39 +08:00
junjie
a53b557359 feat(fix):数据集、视图分组增加搜索 2021-06-21 16:24:16 +08:00
wangjiahao
66eb1c2b3d fix: 拖拽问题回退 2021-06-21 15:33:10 +08:00
wangjiahao
b8d07ce00b Merge remote-tracking branch 'origin/main' into main 2021-06-21 12:39:34 +08:00
wangjiahao
a7b67c5c64 feat: 修改文字组件样式 2021-06-21 12:39:24 +08:00
junjie
40c76c7fb8 feat(fix):tree图标替换 2021-06-21 12:38:04 +08:00
junjie
959879f465 feat(fix):创建视图，选择数据集增加判断 2021-06-21 12:23:26 +08:00
junjie
f6593d2360 feat(fix):视图移动功能 2021-06-21 11:18:38 +08:00
junjie
86fd042ebd feat(fix):视图table优化 2021-06-21 10:54:59 +08:00
junjie
ffefb6032d feat(fix):视图、数据集界面优化 2021-06-20 11:38:12 +08:00
junjie
a33bf12037 feat(feat):数据集，视图分组树优化，去除场景 2021-06-19 12:07:16 +08:00
junjie
cdaba0eb03 feat(feat):数据集，视图分组树优化，去除场景 2021-06-19 11:42:14 +08:00
junjie
1758bf4904 feat(fix):视图表格底部遮挡修复 2021-06-19 11:11:58 +08:00
junjie
70f8082916 Merge remote-tracking branch 'origin/main' into main 2021-06-18 11:07:25 +08:00
junjie
d77d6197ca feat(fix):cron设置增加week说明；cron数字修复 2021-06-18 11:07:12 +08:00
fit2cloud-chenyw
25da337d3e feat: 数据源增加搜索功能 2021-06-18 10:59:51 +08:00
wangjiahao
3e0933d823 Merge remote-tracking branch 'origin/main' into main 2021-06-18 10:58:44 +08:00
wangjiahao
17dd2dbe59 feat: 更换其他组件图标 将上传图片组件 移动到侧边栏中 2021-06-18 10:58:26 +08:00
fit2cloud-chenyw
54057d5dab feat: 完善数据源基本功能 2021-06-17 19:34:46 +08:00
fit2cloud-chenyw
fb0d195aa3 feat: 数据源展示方式改为统一风格树 2021-06-17 18:58:46 +08:00
wangjiahao
f2f698b2d1 fix: 主题设置 表格样式跟随问题 2021-06-17 18:21:13 +08:00
wangjiahao
4ecb283020 Merge remote-tracking branch 'origin/main' into main 2021-06-17 11:46:27 +08:00
wangjiahao
eeb15f9aa2 feat: 编辑仪表盘 辅助栏显示调整 2021-06-17 11:46:15 +08:00
fit2cloud-chenyw
e1ee9a4f7b fix: 表单增加回车保存事件 2021-06-17 10:25:34 +08:00
taojinlong
8ebaf7cfeb feat：國際化 2021-06-17 10:09:40 +08:00
fit2cloud-chenyw
2bead0a66e fix: 系统管理表单增加回车保存事件 2021-06-16 19:30:26 +08:00
junjie
8ea018059d feat(fix):关联视图，去除必须同步的限制 2021-06-16 19:25:33 +08:00
junjie
8852fba90f feat(fix):关联视图限制，非直连数据库统一完成一次同步后才能关联 2021-06-16 18:29:00 +08:00
wangjiahao
1dcdff500f Merge remote-tracking branch 'origin/main' into main 2021-06-16 18:05:59 +08:00
wangjiahao
2d35f27ee3 feat: 默认仪表盘指向源仪表盘 2021-06-16 18:05:47 +08:00
fit2cloud-chenyw
a8b9a4fbb2 feat: 删除不等于 不包含 2021-06-16 18:03:59 +08:00
wangjiahao
c9518c2e4e feat: 编辑仪表盘选择视图时 group也显示文件夹 2021-06-16 17:53:02 +08:00
junjie
7feb74d249 Merge remote-tracking branch 'origin/main' into main 2021-06-16 16:58:32 +08:00
junjie
92ab280817 feat(fix):定时任务弹框的title文案修改 2021-06-16 16:55:36 +08:00
wangjiahao
d89efc707d fix: 仪表盘 背景显示不全问题 2021-06-16 16:55:22 +08:00
wangjiahao
74f2a515ea Merge remote-tracking branch 'origin/main' into main 2021-06-16 15:50:16 +08:00
wangjiahao
6bf2a4f8ae fix: 切换一级目录 清理原有仪表板信息 2021-06-16 15:50:01 +08:00
junjie
e80092e92b feat(fix):数据源名称类型显示修复 2021-06-16 15:41:58 +08:00
wangjiahao
a8ce990a4d feat: 默认仪表盘直接关联源仪表盘 2021-06-16 15:31:27 +08:00
fit2cloud-chenyw
1881b60f71 fix: 修改用户管理查询条件label 2021-06-16 10:09:50 +08:00
wangjiahao
dd53dc28d9 feat: 更换全屏地税 2021-06-16 09:38:40 +08:00
taojinlong
ef6385d529 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-15 17:51:28 +08:00
taojinlong
a75734b948 feat: 增量更新的sql，增加校验 2021-06-15 17:51:18 +08:00
junjie
f261acb72f feat(fix):视图字段变化优化；过滤组件优化；返回数据优化 2021-06-15 17:11:47 +08:00
wangjiahao
314a100fc5 Merge remote-tracking branch 'origin/main' into main 2021-06-15 16:47:51 +08:00
wangjiahao
5dc6c5923f feat: 编辑大屏，显示不全问题 2021-06-15 16:47:35 +08:00
junjie
c084ac68cf feat(fix):直连数据集限制预览数目；数据源文字替换 2021-06-15 16:01:30 +08:00
wangjiahao
21a4073d85 Merge remote-tracking branch 'origin/main' into main 2021-06-11 17:44:57 +08:00
wangjiahao
34c81b07fd feat(fix): 非自适应画布的 仪表盘展示时 超高显示滚动条,修复间隙不准问题 2021-06-11 17:44:47 +08:00
junjie
d8830e1753 feat(fix):删除数据集，自定义数据集报错；添加视图数据预览滚动条优化；关联数据表名优化；切换视图，不清空维度 2021-06-11 17:11:13 +08:00
wangjiahao
a31b783ab0 Merge remote-tracking branch 'origin/main' into main 2021-06-11 16:53:40 +08:00
wangjiahao
698f12fcad feat: 非自适应画布的 仪表盘展示时 超高显示滚动条 2021-06-11 16:53:26 +08:00
junjie
4e54c152ad feat(视图):指标卡位置调整 2021-06-11 14:04:57 +08:00
junjie
7eae8df3f2 Merge remote-tracking branch 'origin/main' into main 2021-06-11 12:24:29 +08:00
junjie
fd916cb8ad feat(视图):暂时隐藏快速计算；增加新的计算汇总方式，适应指标卡、指针仪表盘等汇总统计类图表，仅支持一个指标字段 2021-06-11 12:24:19 +08:00
fit2cloud-chenyw
e20b77b003 fix:【ID1004237】权限管理-菜单权限-普通用户可以禁用任何用户 2021-06-11 12:23:10 +08:00
wangjiahao
1b880d194b feat: 标题样式控制范围太广-不在仪表盘中控制-改为视图自己控制 2021-06-11 12:03:13 +08:00
wangjiahao
dad80f19bb feat: 默认隐藏仪表盘操作列 2021-06-11 11:49:59 +08:00
wangjiahao
7ffb2209ec Merge remote-tracking branch 'origin/main' into main 2021-06-11 11:36:18 +08:00
wangjiahao
f185cbcb33 feat: 优化主题滚动 2021-06-11 11:35:35 +08:00
junjie
d946e7525f feat(frontend):视图添加、标题优化 2021-06-11 10:59:18 +08:00
wangjiahao
97457de0b5 fix:权限表头显示不正确问题 2021-06-11 10:53:21 +08:00
wangjiahao
eaee41334d fix:权限表头显示不正确问题 2021-06-11 09:58:24 +08:00
wangjiahao
a12a670383 Merge remote-tracking branch 'origin/main' into main 2021-06-10 17:46:30 +08:00
wangjiahao
5dd942348a feat: 去掉一些日志 2021-06-10 17:46:16 +08:00
junjie
711428705b feat(frontend):分组、场景pid修改为0 2021-06-10 17:37:33 +08:00
wangjiahao
38dea1ad1d feat: 画布升级 增加矩阵 边界 对齐 吸附等功能 2021-06-10 17:15:30 +08:00
wangjiahao
a06297a73a Merge remote-tracking branch 'origin/main' into main 2021-06-10 17:12:45 +08:00
wangjiahao
dba5eeb571 feat: 画布升级 增加矩阵 边界 对齐 吸附等功能 2021-06-10 17:12:31 +08:00
junjie
7cc2e1a160 feat(frontend):代码修改 2021-06-10 16:47:30 +08:00
junjie
c3a929345b feat(frontend):echarts修改 2021-06-10 16:25:31 +08:00
junjie
1eeebf58e1 feat(frontend):自定义数据集UI样式调整 2021-06-10 15:41:02 +08:00
junjie
6dc0b8d875 feat(frontend):一级分组、场景pid修复 2021-06-10 15:13:37 +08:00
junjie
7e7dc06838 feat(frontend):表格列宽调整 2021-06-10 12:46:18 +08:00
junjie
9daf498192 feat(frontend):表格斑马纹跟随视图背景色 2021-06-10 12:36:28 +08:00
junjie
957d2af7c2 feat(frontend):饼图不继承玫瑰图圆角；sql数据集代码修复 2021-06-10 11:48:30 +08:00
junjie
306b046ded feat(frontend):代码优化 2021-06-10 11:04:58 +08:00
fit2cloud-chenyw
16e9029830 Merge remote-tracking branch 'origin/main' into main 2021-06-10 10:54:22 +08:00
fit2cloud-chenyw
26b9994d14 feat : 保留mock 2021-06-10 10:53:56 +08:00
junjie
dd8e622958 feat(数据集):自定义数据集不能再制作自定义数据集 2021-06-10 10:48:05 +08:00
fit2cloud-chenyw
113d04b5a1 fix: 正式环境禁用moke；尝试修复视图加载阻塞导致浏览器无响应 2021-06-10 09:46:06 +08:00
junjie
9975287b75 feat(frontend):表格合计样式fix 2021-06-09 17:21:17 +08:00
junjie
ef59ad96bf feat(frontend):数据集添加bug修复 2021-06-09 16:05:15 +08:00
fit2cloud-chenyw
2557402d95 fix: 【ID1004196】【系统管理-参数管理】展示的登陆页面标题和设置的不一致 2021-06-09 15:02:38 +08:00
fit2cloud-chenyw
4defc8490a feat: 前端axios超时时间设置为10s 2021-06-09 14:35:38 +08:00
junjie
6e60a265d5 feat(frontend):数据集名称长度限制提示修改；视图名称和标题统一，保存按钮优化 2021-06-09 10:54:16 +08:00
junjie
d585fd469f feat(数据集):数据集 分组、场景、数据集移动功能 2021-06-09 10:16:58 +08:00
fit2cloud-chenyw
584a5499ad fix: 初次编辑仪表板 条件失效 2021-06-09 09:46:56 +08:00
fit2cloud-chenyw
9e93a8b215 fix: 修复新增查询组件错误 2021-06-08 16:35:27 +08:00
junjie
a2fa6771fa feat(frontend):数据集UI文字调整 2021-06-08 16:30:20 +08:00
fit2cloud-chenyw
880a26cd0a feat: 仪表板过滤 局部刷新 基本功能完善 2021-06-08 16:03:49 +08:00
junjie
1b1f3e056c feat(frontend):分组场景菜单控制优化，默认隐藏，鼠标移上后显示 2021-06-08 15:00:13 +08:00
fit2cloud-chenyw
8ac634fbb3 feat: 优化仪表板查询使用局部请求 2021-06-08 12:39:04 +08:00
junjie
6246a4532c feat(数据集):编辑excel 2021-06-08 12:30:26 +08:00
junjie
d4bb57de61 Merge remote-tracking branch 'origin/main' into main 2021-06-08 12:17:05 +08:00
junjie
ebe6f306c6 feat(数据集):编辑数据集修改 2021-06-08 12:16:55 +08:00
taojinlong
d04500f3a7 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-08 12:16:37 +08:00
taojinlong
a196430d85 feat: 替换svg logo图片 2021-06-08 12:16:25 +08:00
junjie
c839b3cba4 feat(数据集):编辑excel前端 2021-06-08 11:30:26 +08:00
junjie
0195edea45 feat(数据集):编辑excel前端 2021-06-08 11:12:40 +08:00
fit2cloud-chenyw
198208fc8c feat: 删除debugger和console.log 2021-06-07 17:11:33 +08:00
fit2cloud-chenyw
e520101af1 feat: 格式化前端报错代码 2021-06-07 17:08:57 +08:00
junjie
f1c552ff44 feat(chart):表格chart增加id 2021-06-07 15:42:24 +08:00
wangjiahao
704d86adf4 feat: 数据源管理权限 控制到数据 2021-06-07 14:47:27 +08:00
wangjiahao
c16d531483 feat: 模板导入增加模板标识 2021-06-07 11:41:25 +08:00
junjie
2b85822794 feat(提示):视图提示优化 2021-06-07 11:01:21 +08:00
fit2cloud-chenyw
ee6138d297 fix：设置弹出组件样式 2021-06-06 11:09:52 +08:00
fit2cloud-chenyw
b30564568c fix: 【ID1004126】【仪表板】添加文本下拉组件，未开启多选实际可以拖动多个字段 2021-06-06 08:50:34 +08:00
fit2cloud-chenyw
45e304f132 fix: 【ID1004132】【仪表板】添加组件时数据列表建议加个加载中的提示 2021-06-06 07:53:48 +08:00
wangjiahao
59fa7e0c20 Merge remote-tracking branch 'origin/main' into main 2021-06-04 23:22:00 +08:00
wangjiahao
0b56ae1b3c feat(fix): 1.权限查询效率优化 2.替换权限开启图标，3.授权对象类型切换 授权资源权限依旧保留问题,4.开放普通用户 组织对菜单的授权 2021-06-04 23:21:47 +08:00
junjie
5cdfd72807 feat(视图):生成视图错误样式优化 2021-06-04 18:50:49 +08:00
fit2cloud-chenyw
14bf48137d fix: 【ID1003939】角色管理-修改自定义表格字段-刷新页面/添加/编辑角色后又自动恢复默认值 2021-06-04 18:01:51 +08:00
junjie
88e8cf1cd7 feat(视图):统一风格 2021-06-04 17:27:14 +08:00
junjie
133e883786 feat(frontend):文本过长，显示优化以及tooltip 2021-06-04 17:16:50 +08:00
fit2cloud-chenyw
03f43fde95 fix: 【ID1004129】【仪表板】一个用户取消收藏后其他收藏的用户也没有了 2021-06-04 16:58:50 +08:00
wangjiahao
63fa24fcb4 fix: 修复仪表盘视图查不出来的问题 2021-06-04 16:23:17 +08:00
junjie
4db81f9d85 feat(数据集):数据集字段编辑展示原始类型 2021-06-04 15:34:11 +08:00
junjie
8e272cf85a feat(视图):先强制展示echarts y轴 2021-06-04 15:14:29 +08:00
junjie
fb07c111c5 feat(fix):模版管理form校验fix 2021-06-04 15:11:06 +08:00
wangjiahao
fa70a33de1 feat: 去掉不必要的前段日志 2021-06-04 14:35:32 +08:00
wangjiahao
fccd7d8f29 feat: 优化仪表盘页面loading 2021-06-04 12:33:08 +08:00
wangjiahao
0f2f3983bb feat: 优化仪表盘页面loading 2021-06-04 12:22:34 +08:00
wangjiahao
df0d2a9b22 Merge remote-tracking branch 'origin/main' into main 2021-06-04 11:20:07 +08:00
wangjiahao
ccf13b9e50 feat: 1.编辑界面调整 预览自动全屏预览 2.仪表盘主界面调整，增加全屏预览，新tab页预览 2021-06-04 11:19:50 +08:00
fit2cloud-chenyw
a51ec3e2eb fix: 去除无用代码 2021-06-04 11:11:21 +08:00
junjie
c3e9157761 feat(fix):登陆校验优化 2021-06-04 10:57:58 +08:00
wangjiahao
62ca8a2dd5 feat: 优化仪表板和模板的默认排序 2021-06-03 18:47:36 +08:00
wangjiahao
dc742d1b36 Merge remote-tracking branch 'origin/main' into main 2021-06-03 18:40:58 +08:00
wangjiahao
b69920675f fix: 仪表板目录无法重命名问题 2021-06-03 18:40:46 +08:00
junjie
071cafcd26 feat(fix):自动刷新不需要loading，解决界面拉伸后自动恢复 2021-06-03 17:02:12 +08:00
taojinlong
48069f563f fix: 判断导入数据执行结果 2021-06-03 15:10:54 +08:00
junjie
3f17e3c31a feat(fix):前端样式调整 2021-06-03 11:28:44 +08:00
fit2cloud-chenyw
31a59021cc fix: 仪表板首页tabs样式 使用>>> 误伤分享tabs样式 2021-06-03 09:47:10 +08:00
junjie
4108e68927 feat(fix):前端样式调整 2021-06-02 19:22:04 +08:00
junjie
fb02dd6160 feat(fix):前端样式调整 2021-06-02 18:49:14 +08:00
wangjiahao
974d7549f6 Merge remote-tracking branch 'origin/main' into main 2021-06-02 17:45:49 +08:00
wangjiahao
bd15937f09 fix: 优化模板查询方式，改为异步查询；修复能长传空模板问题 2021-06-02 17:45:37 +08:00
junjie
7198971263 Merge remote-tracking branch 'origin/main' into main 2021-06-02 17:36:02 +08:00
junjie
ec24cf3d39 feat(fix):前端请求，loading配置 2021-06-02 17:35:50 +08:00
fit2cloud-chenyw
5b29f93eff feat: 禁止修改admin的Id、状态以及角色 2021-06-02 17:34:56 +08:00
fit2cloud-chenyw
fad49bd4bf fix: admin用户设置无法删除 2021-06-02 17:23:27 +08:00
fit2cloud-chenyw
94ae241403 fix: 用户列表按状态排序报错 2021-06-02 16:36:36 +08:00
fit2cloud-chenyw
d6a421109e fix: 过滤组件弹框样式修改 2021-06-02 16:21:56 +08:00
junjie
47392eead8 feat(fix):定时任务重启执行修复；前端form校验优化 2021-06-02 16:16:20 +08:00
fit2cloud-chenyw
5871e15387 fix: 组件树显示不完整 2021-06-02 15:23:06 +08:00
fit2cloud-chenyw
af4e85e10c fix: 仪表盘 组件树状结构不正确 2021-06-02 15:14:29 +08:00
fit2cloud-chenyw
24d1c35d0f feat: 用户列表增加排序功能 2021-06-02 13:52:01 +08:00
junjie
c2cb12c73b feat(fix):添加db数据集，默认加上数据源名称 2021-06-02 11:59:33 +08:00
junjie
cf62ecefbd feat(frontend):icon修改 2021-06-02 11:31:25 +08:00
junjie
c3fce40038 feat(frontend):logo等尺寸调整限制 2021-06-02 11:03:43 +08:00
fit2cloud-chenyw
52179d814c fix: 【ID1003566】【仪表盘】仪表盘编辑页面的组件页，滚动条应该在列表框内侧 2021-06-02 10:23:21 +08:00
junjie
98f69d4eaf feat(数据源):数据源校验提示优化 2021-06-02 10:20:03 +08:00
wangjiahao
eeb331d522 fix: 仪表盘编辑时清除临时数据缓存 去除不必要的debugger和日志 2021-06-01 23:02:00 +08:00
wangjiahao
837c4cd34f Merge remote-tracking branch 'origin/main' into main 2021-06-01 22:46:26 +08:00
wangjiahao
039f3832a8 feat(仪表盘): 增加文字组件 矩形组件等，统一归类为样式组件 增加仪表盘侧边 '其他' 按钮 用来存放其他类型的组件 2021-06-01 22:46:08 +08:00
junjie
858c7f27e6 feat(视图):添加视图增加默认名称 2021-06-01 18:56:26 +08:00
fit2cloud-chenyw
fd411ca7af fix:【ID1003581】仪表盘 组件树状结构不正确 2021-06-01 18:35:18 +08:00
fit2cloud-chenyw
b5e91fcc2d feat: 普通员工默认权限设置 2021-06-01 16:24:54 +08:00
taojinlong
9ec595a158 feat: 更新任务列表页 自动刷新（5s） 2021-06-01 16:10:47 +08:00
junjie
196c003445 feat(视图):添加视图增加loading 2021-06-01 15:58:03 +08:00
junjie
4cbe01ca16 feat(视图):为日期维度，增加日期显示与格式转换功能 2021-06-01 15:44:33 +08:00
wangjiahao
b281eaf031 Merge remote-tracking branch 'origin/main' into main 2021-06-01 13:40:36 +08:00
wangjiahao
5ef299dfcf feat: 编辑仪表盘同时支持自适应画布区域和实际画布大小两种编辑模式 2021-06-01 13:40:26 +08:00
fit2cloud-chenyw
d1687d5d4c feat: xpack插件默认安装表记录 2021-06-01 13:29:54 +08:00
fit2cloud-chenyw
35796108c7 feat: 初步整合xpack功能完毕 2021-06-01 11:13:40 +08:00
junjie
10b0e87f62 feat(视图):图表类型鼠标放上后，显示提示 2021-05-31 16:46:23 +08:00
junjie
7838dface2 feat(视图):属性、样式中，是否显示放到外面控制，不显示则禁用属性编辑；外侧标题移入到标题的样式中 2021-05-31 16:20:28 +08:00
wangjiahao
ac44119ab2 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-31 14:26:31 +08:00
wangjiahao
13da216816 feat: 增加菜单授权管理 2021-05-31 14:26:19 +08:00
fit2cloud-chenyw
1ffbe36c3c feat: 整合xpack'组织管理' 2021-05-31 14:07:12 +08:00
taojinlong
dccfd6ec27 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-31 12:50:23 +08:00
taojinlong
99bae93fb5 feat: 限制数据集只有一个同步任务;数据源支持修改密码和端口号 2021-05-31 12:49:55 +08:00
wangjiahao
cfd8e6eb2b Merge remote-tracking branch 'origin/main' into main 2021-05-31 11:20:43 +08:00
wangjiahao
ceb1805083 feat: 新增组件辅助设计 可以精确定位组件坐标 宽高透明度 2021-05-31 11:20:32 +08:00
junjie
8481fec921 feat(frontend):弹框选择数据集增加loading 2021-05-31 10:49:10 +08:00
junjie
58299c74fb feat(frontend):部分地方主题色修改；弹框选择数据集增加loading 2021-05-31 10:44:44 +08:00
fit2cloud-chenyw
5f267e7723 feat: 前端远程异步动态组件，渲染插件模块用 2021-05-30 20:25:58 +08:00
fit2cloud-chenyw
ae733b0776 fix: 删除原有菜单'系统参数'、'角色管理'，初步整合xpack插件模块 2021-05-30 20:24:54 +08:00
junjie
30fc9c5e73 feat(视图):创建视图名称覆盖bug 2021-05-28 18:41:07 +08:00
junjie
10c6ca4b98 feat(role):内置角色增加创建时间，并无法编辑 删除 2021-05-28 18:19:19 +08:00
junjie
440dd28fbb feat(frontend):1.角色分页相关bug修复；2.内置角色禁止编辑和删除；3.右上角下拉菜单文案修改 2021-05-28 17:48:05 +08:00
taojinlong
c262914b60 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-28 17:24:52 +08:00
taojinlong
f99865cf8d feat: 更新任务立即执行时， 2021-05-28 16:37:37 +08:00
junjie
1965ff3eab feat(frontend):成功、警告、错误等色值修改与element-ui，fit2cloud-ui一致，原先的太亮；角色i18n修复 2021-05-28 16:31:07 +08:00
junjie
b4e503612a feat(视图):添加视图，预览数据表头增加字段类型icon显示 2021-05-28 16:12:37 +08:00
junjie
1361ac02b1 feat(视图):添加视图，选择数据集预览前100条数据增加文字提示 2021-05-28 16:04:59 +08:00
junjie
be7a7fb2dc feat(视图):面积堆叠图进入默认显示面积 2021-05-28 15:45:47 +08:00
taojinlong
edfb017066 fix: 冲突 2021-05-28 12:51:26 +08:00
taojinlong
7f48bf4fe4 fix: 检测同步任务 2021-05-28 12:48:16 +08:00
junjie
e955d2bfff feat(frontend):user列表增加角色字段；数据源添加报错fix 2021-05-28 12:40:19 +08:00
junjie
d86080ffc8 feat(chart):radar max fix 2021-05-28 11:38:16 +08:00
wangjiahao
1ce02bf403 feat: 仪表盘命名出现多个仪表盘问题,仪表盘改为仪表板 2021-05-28 11:21:54 +08:00
wangjiahao
ba3117fbad fix: UI 调整 2021-05-28 10:18:21 +08:00
wangjiahao
f25cbc9fd1 fix: UI 调整 2021-05-28 00:12:55 +08:00
wangjiahao
71bafb628c fix: UI 调整 2021-05-28 00:04:39 +08:00
wangjiahao
7d16420f35 Merge remote-tracking branch 'origin/main' into main 2021-05-27 18:54:24 +08:00
wangjiahao
836fde170c fix: UI 调整 2021-05-27 18:54:06 +08:00
junjie
0f4efa8c2e feat(仪表板):UI fix 2021-05-27 17:49:14 +08:00
junjie
07a8b82914 feat(仪表板):UI fix 2021-05-27 17:34:46 +08:00
wangjiahao
36a327f81c fix: UI 调整 2021-05-27 17:06:38 +08:00
wangjiahao
1537c8d2f5 Merge remote-tracking branch 'origin/main' into main 2021-05-27 14:17:55 +08:00
wangjiahao
1be642aeca feat: 用户权限可被收回 2021-05-27 14:17:27 +08:00
junjie
d4daade0d3 feat(frontend):1.操作button样式修改；2.数据源文字fix；3.仪表盘样式fix，先看看，再调整 2021-05-27 12:04:11 +08:00
junjie
5cfc7b0cac feat(frontend):仪表板分享报错fix 2021-05-27 10:50:27 +08:00
junjie
83555f9830 feat(cron):cron fix 2021-05-26 18:46:19 +08:00
wangjiahao
77a919c60d feat: 画布样式修改 也记录镜像 2021-05-26 18:12:22 +08:00
wangjiahao
070ff39641 feat: 样式修改 2021-05-26 16:41:52 +08:00
wangjiahao
44921cb6a5 Merge remote-tracking branch 'origin/main' into main 2021-05-26 16:16:07 +08:00
wangjiahao
22248e521a fix: 编辑仪表盘时 卡顿导致视图大小不变的问题 2021-05-26 16:15:54 +08:00
junjie
6502f7213b feat(frontend):UI fix 2021-05-26 15:54:00 +08:00
junjie
eedc3076a0 feat(仪表盘):分享filter切换保留是否已分享状态 2021-05-26 15:36:41 +08:00
junjie
7b069ffe26 feat(仪表盘):分享用户，去除当前用户 2021-05-26 14:40:09 +08:00
wangjiahao
a2d83b2d61 feat: UI调整 2021-05-26 14:09:28 +08:00
wangjiahao
cb1c4c0ba7 Merge remote-tracking branch 'origin/main' into main 2021-05-26 12:27:06 +08:00
wangjiahao
7854f36dce fix: UI调整 2021-05-26 12:26:30 +08:00
junjie
c1b20e0f9f feat(frontend):登录页UI调整 2021-05-26 11:59:28 +08:00
junjie
af6dd2557b feat(frontend):登陆页UI fix；文字提示修改 2021-05-26 11:32:07 +08:00
junjie
592e8c9c5e feat(frontend):UI fix 2021-05-26 11:00:41 +08:00
junjie
e6bb1895ac feat(frontend):UI fix 2021-05-26 10:33:05 +08:00
junjie
946b1e52b8 feat(frontend):UI fix 2021-05-26 10:18:25 +08:00
taojinlong
cc2abfa06f Merge branch 'main' of github.com:dataease/dataease into main 2021-05-25 21:26:53 +08:00
taojinlong
1eb8c97238 fix: 國際化 2021-05-25 19:26:39 +08:00
wangjiahao
91fdee6e49 Merge remote-tracking branch 'origin/main' into main 2021-05-25 19:11:12 +08:00
wangjiahao
a83ba94054 fix: UI调整 2021-05-25 19:11:00 +08:00
junjie
d0f564d429 feat(user):创建用户支持设置密码；用户表单UI字段名fix 2021-05-25 19:10:30 +08:00
wangjiahao
9bf1c52824 Merge remote-tracking branch 'origin/main' into main 2021-05-25 18:59:59 +08:00
wangjiahao
00b8e2d4a5 fix: 模板不允许重名 但是可以允许覆盖 2021-05-25 18:58:47 +08:00
taojinlong
cfc65b9dcb fix: 预览数据错误 2021-05-25 17:51:35 +08:00