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

2272 Commits

Author SHA1 Message Date
王嘉豪
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
王嘉豪
7eb9849092
Merge pull request #943 from dataease/pr@dev@feat_panel-hyperlinks 
refactor:文本超链接hover增加提示
 2021-10-14 18:53:47 +08:00
wangjiahao
94209dd32f refactor:文本超链接hover增加提示 2021-10-14 18:52:53 +08:00
junjie
412432acf8 feat:antv 2021-10-14 18:06:19 +08:00
taojinlong
356c20f16f Merge branch 'dev' of github.com:dataease/dataease into dev 2021-10-14 17:55:50 +08:00
taojinlong
7ff9b00deb feat: druid 替换 c3p0; 以类加载的方式引入数据源驱动；支持myqsl5.1 2021-10-14 17:55:27 +08:00
fit2cloud-chenyw
72b9c62008
Merge pull request #938 from dataease/pr@dev@fix_1.3_leftover 
fix: api文档优化
 2021-10-14 17:20:22 +08:00
wangjiahao
6e2dd0187b feat:增加支持文本超链接 2021-10-14 16:44:51 +08:00
fit2cloud-chenyw
03ab93664d fix: 仪表板选项卡未选择视图时拖动报错 2021-10-14 14:58:35 +08:00
fit2cloud-chenyw
74ec45a458 fix: 下拉组件选项宽度无限宽 2021-10-14 14:41:28 +08:00
taojinlong
131d964546 fix: excel 替换后，字段标示没有重新渲染 2021-10-14 10:17:55 +08:00
taojinlong
48fc0234cf fix: excel 替换后，字段标示没有重新渲染 2021-10-14 10:16:31 +08:00
taojinlong
74a7e2c15e Merge branch 'dev' of github.com:dataease/dataease into dev 2021-10-13 18:45:45 +08:00
taojinlong
0904b24a8f fix: 【数据集】追加excel时创建excel提示异常 2021-10-13 18:45:29 +08:00
taojinlong
5e8713612b Merge branch 'v1.3' of github.com:dataease/dataease into v1.3 2021-10-13 18:44:39 +08:00
taojinlong
6f8e75601c fix: 【数据集】追加excel时创建excel提示异常 2021-10-13 18:44:07 +08:00
wangjiahao
82abe6c6ad refactor:增加拖拽阴影动画，靠右边界矩阵组件改变大小可能定位不准问题 2021-10-13 17:38:52 +08:00
fit2cloud-chenyw
b9068dc9ab fix: 日期范围组件颠倒开始时间结束时间 2021-10-13 17:01:01 +08:00
fit2cloud-chenyw
4795285510 style: 数据集样式优化 2021-10-13 15:42:13 +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
fit2cloud-chenyw
69097de5b6
Merge pull request #911 from dataease/pr@dev@fix_cyw_1.3 
fix: 选项卡选择试图有默认选项
 2021-10-12 15:32:09 +08:00
fit2cloud-chenyw
3bb4258cd8 fix: 选项卡选择试图有默认选项 2021-10-12 15:02:11 +08:00
fit2cloud-chenyw
82c891d645 fix: 仪表板调整选项卡大小 2021-10-12 14:39:43 +08:00
wangjiahao
a50747c8e3 refactor: 去掉画布键盘事件 防止其他菜单出现粘贴报错的情况 2021-10-12 14:25:45 +08:00
wangjiahao
e9acd38621 fix: 撤销或者重做时，视图矩阵模式记录镜像位置不准确问题 2021-10-12 14:18:55 +08:00
wangjiahao
9fbfde2313 fix: 撤销或者重做时，视图矩阵模式可能失效的问题 2021-10-12 12:45:10 +08:00
wangjiahao
a0a823bbd3 Merge remote-tracking branch 'origin/dev' into dev 2021-10-12 12:34:23 +08:00
wangjiahao
c81ca9d249 fix: 修复过滤组件取消，图片上传取消矩阵模式依然占位的问题 2021-10-12 12:33:00 +08:00
fit2cloud-chenyw
d6a32d71d5
Merge pull request #908 from dataease/pr@dev@style_light_theme 
style: 优化浅色主题样式
 2021-10-12 11:49:50 +08:00
fit2cloud-chenyw
78630536c3 style: 优化浅色主题样式 2021-10-12 11:48:47 +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
7167dd4e35 style: 滚动条样式改不动 2021-10-11 19:10:57 +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
fit2cloud-chenyw
3a84a9e204 style: 完善sider侧边菜单样式 2021-10-11 10:45:17 +08:00
wangjiahao
158b3a1e29 refactor: 画布按钮位置调整 2021-10-10 23:44:10 +08:00
wangjiahao
e5d5afda0e refactor: 画布按钮位置调整 2021-10-10 21:03:34 +08:00
wangjiahao
e2626d0423 refactor: 视图矩阵和悬浮相互切换显示优化 2021-10-10 20:58:22 +08:00
wangjiahao
0a49003cdf refactor: 画布优化 2021-10-10 20:17:38 +08:00
wangjiahao
99a08ba789 refactor: 画布优化 2021-10-10 19:38:44 +08:00
wangjiahao
0bb8ccaea8 fix: 刷新时间设置时间被还原问题 2021-10-10 17:19:26 +08:00
wangjiahao
b7d5f0b86c refactor: 画布优化 2021-10-10 17:04:23 +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
a7fb283c07 refactor: 代码回退 2021-10-09 14:24:19 +08:00
wangjiahao
4da24c0cf5 refactor: 更改矩阵设计按钮位置 2021-10-09 13:58:31 +08:00
wangjiahao
66f6a726cd fix:文本框组件，格式框有时不显示问题 2021-10-09 11:58:27 +08:00
wangjiahao
c427e548c0 refactor:去掉多余的前端日志 2021-10-09 11:44:01 +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
9341d63914 perf: 优化数字输入框样式 2021-10-08 18:31:19 +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
王嘉豪
92ca6401ba
Merge pull request #873 from dataease/pr@dev@refactor_panel-revert 
refactor:代码回退
 2021-09-24 18:29:17 +08:00
wangjiahao
bb1947630c refactor:代码回退 2021-09-24 18:28:11 +08:00
fit2cloud-chenyw
2586a4b37d fix: 修复仪表板tab组件样式 2021-09-24 17:27:47 +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
f27163145a fix:修复pdf导出图片显示不全问题 2021-09-23 18:38:24 +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
fit2cloud-chenyw
a72a4a1143 feat: 替换tabs图标 2021-09-23 15:37:40 +08:00
fit2cloud-chenyw
7dac4702c8 feat: 仪表板tabs组件 2021-09-23 15:30:11 +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
08dcd230c6 refactor:优化外部组件预定位阴影区，防止阴影区拖拽是超出边界 2021-09-22 18:44:30 +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
wangjiahao
24589b12aa refactor:仪表板矩形，文字组件，间隙等默认样式调整 2021-09-17 11:25:15 +08:00
wangjiahao
486fd0f605 feat:仪表板视图拖拽阴影跟随 2021-09-17 10:51:22 +08:00
wangjiahao
e35bb5c692 feat:仪表板视图拖拽阴影跟随 2021-09-16 18:42:11 +08:00
wangjiahao
3f4375827f feat:仪表板视图改变大矩阵式设计预判视图实际尺寸大小 2021-09-16 16:10:16 +08:00
wangjiahao
10e0f64b44 feat:仪表板视图改变大小时增加阴影效果 2021-09-16 12:04:21 +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
fit2cloud-chenyw
edabc69bc4
Merge pull request #823 from dataease/pr@dev@feat_sso_language 
feat: 完善国际化
 2021-09-15 18:08:26 +08:00
fit2cloud-chenyw
53b5d844de feat: 完善国际化 2021-09-15 18:07:04 +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
4c9e0d6722 fix: 头部未读消息条数增加手动刷新机制 2021-09-15 15:42:39 +08:00
fit2cloud-chenyw
4ef83c477e feat: 增加sso用户flyway,完善单点登出 2021-09-15 14:41:06 +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
wangjiahao
0f91ee6615 fix:修复全屏状态编辑仪表板时，预览仪表板再退出视图错位问题 2021-09-14 11:28:04 +08:00
wangjiahao
353b5ca6ad refactor:增加文字组件样式设置，修复只输入问题不显示保存问题 2021-09-13 17:58:58 +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
ad9f8b19f9
Merge pull request #807 from dataease/pr@dev@feat_oidc_sso 
fix: 新增用户邮箱重复报错提示
 2021-09-10 17:13:25 +08:00
fit2cloud-chenyw
4930ec17fe feat: 新增oidc配置 2021-09-10 15:52:45 +08:00
wangjiahao
3d59c010d2 fix:视图更换数据集可能导致联动失效的问题 2021-09-10 11:22:41 +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
junjie
6ef08b469a feat(视图): 组合图双y轴 2021-09-07 11:44:36 +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
e3b93d953a fix: 二级菜单选中时候显示主题悬浮色 2021-09-03 16:28:53 +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
93e40832fb fix:全屏模式下输入框输入内容自动退出的问题 2021-09-01 15:14:50 +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
e4480d1f7b fix: 日期组件必须点左侧挂件才能弹出日期 2021-08-31 16:18:56 +08:00
fit2cloud-chenyw
efd215cad4 fix: 收藏列表仪表板名称过长展示... 2021-08-31 16:18:43 +08:00
fit2cloud-chenyw
ca80014096 fix: 日期组件必须点左侧挂件才能弹出日期 2021-08-31 16:15:10 +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
338b3104c6 fix: 修改删除组织提示信息 2021-08-31 13:02:05 +08:00
fit2cloud-chenyw
17ca2b2164 fix: 修改删除组织提示信息 2021-08-31 13:00:26 +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
fit2cloud-chenyw
740922f982 fix:条件组件值回显错误 2021-08-30 17:31:00 +08:00
fit2cloud-chenyw
136bbd9a28 fix:条件组件值回显错误 2021-08-30 17:21:54 +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
王嘉豪
40a2757630
Merge pull request #710 from dataease/pr@v1.2@fix_panel-show-details 
Pr@v1.2@fix panel show details
 2021-08-27 11:22:21 +08:00
wangjiahao
386e2cbf6f fix:修复存在过滤组件的仪表板明细弹出不对问题 2021-08-27 11:20:35 +08:00
王嘉豪
c013e923af
Merge pull request #707 from dataease/refactor_demo-add 
Refactor demo add
 2021-08-26 18:34:56 +08:00
王嘉豪
95ad6d09d7
Merge pull request #706 from dataease/refactor_demo-add 
feat:文字组件增加透视功能
 2021-08-26 18:34:13 +08:00
wangjiahao
f999acdaaf feat:文字组件增加透视功能 2021-08-26 18:33:09 +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
f02a7e7523 fix: 表格和视图类型圆角无效 2021-08-25 16:08:27 +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
王嘉豪
a1f3724cf9
Merge pull request #691 from dataease/pr@dev@refactor_style-change 
refactor:仪表版首次刷新设置为5分钟
 2021-08-24 13:49:34 +08:00
wangjiahao
407bdb52c4 refactor:仪表版首次刷线设置为5分钟 2021-08-24 13:45:45 +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
9b6312b2e0 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-23 16:27:31 +08:00
taojinlong
4eaaf2273e feat: 校验数据源状态时，同时刷新左侧菜单中数据源的状态 2021-08-23 16:27:05 +08:00
wangjiahao
523ff395f5 refactor:样式调整，放着transfrom使z-index失效 2021-08-23 15:51:19 +08:00
wangjiahao
9d0951bca3 refactor:仪表板编辑清除联动信息不需要再保存 2021-08-23 15:10:13 +08:00
wangjiahao
dab778b109 refactor:编辑时视图的设置按钮永远在最上层 2021-08-23 14:46:46 +08:00
wangjiahao
9a72159a5c refactor:仪表板保存时清理联动信息 2021-08-23 10:10:36 +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
王嘉豪
8afb2705e8
Merge pull request #664 from dataease/pr@dev@feat_panel-linkage-bar 
refactor:仪表板视图编辑等图标增加悬浮提示
 2021-08-18 18:10:14 +08:00
wangjiahao
879e391c7c refactor:仪表板视图编辑等图标增加悬浮提示 2021-08-18 18:06:32 +08:00
junjie
a4cc937575 feat: 矩形树图优化 2021-08-18 18:04:53 +08:00
王嘉豪
475e6059e7
Merge pull request #662 from dataease/pr@dev@feat_panel-linkage-bar 
refactor:联动设置出现未匹配的字段时，给提示
 2021-08-18 17:15:23 +08:00
wangjiahao
9d5173411f refactor:联动设置出现未匹配的字段时，给提示 2021-08-18 17:10:52 +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
fit2cloud-chenyw
85b172353d
Merge pull request #657 from dataease/pr@dev@fix_number_ranger_filter_style 
fix: 仪表板数字范围组件样式错误
 2021-08-18 14:46:28 +08:00
fit2cloud-chenyw
f257b4db1d fix: 仪表板数字范围组件样式错误 2021-08-18 14:45:30 +08:00
junjie
3b5bb9b17b feat: 字段编辑优化界面显示 2021-08-18 14:01:56 +08:00
王嘉豪
4e37a64e19
Merge pull request #655 from dataease/pr@dev@feat_panel-linkage-bar 
refactor:去掉注释
 2021-08-18 13:50:22 +08:00
wangjiahao
28d85b8349 refactor:去掉注释 2021-08-18 13:49:44 +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
wangjiahao
2a8d39bbb8 feat:仪表板联动时，在视图上增加取消联动按钮 2021-08-17 18:52:22 +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
2fbed9fdec fix: 定时查询未读消息条数错误 2021-08-17 12:25:22 +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
948db7b6dd Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-16 18:43:49 +08:00
taojinlong
3a5fbf66ec Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-16 18:32:28 +08:00
wangjiahao
6db0747009 refactor:仪表板编辑视图样式优化 2021-08-16 18:31:32 +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
cc726fe738 feat: 文本列表组件增加滚动条 2021-08-16 14:45:34 +08:00
taojinlong
ede4ebded2 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-16 14:09:23 +08:00
taojinlong
9cda59e224 feat: 定时检测数据源状态信息 2021-08-16 14:09:02 +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
wangjiahao
af5af6411a Merge remote-tracking branch 'origin/dev' into dev 2021-08-13 14:10:48 +08:00
wangjiahao
d8a9b0a0a8 refactor:代码回退 2021-08-13 14:10:15 +08:00
fit2cloud-chenyw
3872db731b
Merge pull request #619 from dataease/pr@dev@fix_public_url_pwd_in_iframe 
fix: 外部链接带密码嵌在iframe
 2021-08-13 14:01:59 +08:00
fit2cloud-chenyw
8300139508 fix: 外部链接带密码嵌在iframe 2021-08-13 14:00:12 +08:00
wangjiahao
4e69aa6e1d refactor:优化仪表板元素拖动，大小变动延迟渲染，移动使用原始dom 2021-08-13 13:58:27 +08:00
junjie
14f28e8baf feat: 地图颜色 2021-08-13 13:36:10 +08:00
junjie
f96e8a2a88 feat: 地图样式 2021-08-13 12:42:59 +08:00
XiaJunjie2020
866744ae75
Merge pull request #615 from dataease/pr@dev@refactor_remove_code 
refactor: 移除注释
 2021-08-13 12:11:27 +08:00
junjie
cc8587aade refactor: 移除注释 2021-08-13 12:10:36 +08:00
fit2cloud-chenyw
2482fc11c8 fix: 外部链接token存储使用vuex不实用cookie 2021-08-13 12:09:41 +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
taojinlong
db3e6fe7b5 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-13 11:23:37 +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
wangjiahao
39b1c8f6a3 refactor:增加国际化信息 2021-08-13 10:55:25 +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
c70c6cffa7
Merge pull request #609 from dataease/pr@dev@feat_恢复地图缓存 
feat: 地图缓存 地图联动预留接口
 2021-08-12 18:21:46 +08:00
fit2cloud-chenyw
49441ace63 feat: 地图缓存 地图联动预留接口 2021-08-12 18:18:37 +08:00
wangjiahao
1a5cc7cc71 refacotr:仪表板联动下钻等，无需重新加载视图 2021-08-12 17:19:26 +08:00
wangjiahao
18e8854afa fix:前端cosole报错问题 2021-08-12 16:45:21 +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
3d5ffb8cfe feat:仪表板支持视图上卷 2021-08-11 18:41:05 +08:00
wangjiahao
5ddd0a034d feat:仪表板支持视图下钻 2021-08-11 18:32: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
e3cff22620
Merge pull request #587 from dataease/pr@dev@feat_包装api接口文档 
feat: 包装api接口文档
 2021-08-11 15:03:05 +08:00
fit2cloud-chenyw
99aac19d46 feat: 包装api接口文档 2021-08-11 14:58:29 +08:00
wangjiahao
ef979dbd72 refactor:增加钻取等图标样式 2021-08-11 14:08:46 +08:00
junjie
b681b21427 feat: 视图下钻 2021-08-11 10:46:32 +08:00
junjie
3a6f89eb21 feat: 视图下钻 2021-08-11 10:35:00 +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
wangjiahao
7696f4a4a5 refactor:调整仪表板清除联动按钮位置 2021-08-10 18:52:58 +08:00
王嘉豪
6794a33564
Merge pull request #575 from dataease/pr@dev@refactor_panel-linkage-more 
refactor:优化仪表板多视图同时联动效果
 2021-08-10 18:29:19 +08:00
junjie
b2162703d9 feat: 视图返回字段构建 2021-08-10 18:27:11 +08:00
wangjiahao
1fda6f9b86 refactor:优化仪表板多视图同时联动效果 2021-08-10 18:27:00 +08:00
王嘉豪
21722001c2
Merge pull request #573 from dataease/pr@dev@refactor_linkage-toobar 
refactor:清除联动按钮可以提示仪表板保存
 2021-08-10 17:55:16 +08:00
wangjiahao
83c04ef3df refactor:清除联动按钮可以提示仪表板保存 2021-08-10 17:54:23 +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
wangjiahao
22d32aafaa feat:怎讲仪表板联动清除按钮 2021-08-10 17:45:23 +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
XiaJunjie2020
b79339ce9e
Merge pull request #562 from dataease/pr@dev@feat_限制矩形图指标数量 
feat: 限制矩形图指标数量
 2021-08-09 16:57:48 +08:00
junjie
54e0490279 feat: 限制矩形图指标数量 2021-08-09 16:56:49 +08:00
fit2cloud-chenyw
9adde0ca10
Merge pull request #561 from dataease/pr@dev@feat_aksk_sql 
feat: 添加ak,sk的flyway
 2021-08-09 16:53:21 +08:00
fit2cloud-chenyw
8b421b8f91 feat: 添加ak,sk的flyway 2021-08-09 16:52:04 +08:00
junjie
64f7b943e4 fix: 删除多余代码 2021-08-09 16:43:47 +08:00
junjie
ed034e59f4 feat: 矩形树图 2021-08-09 16:37:15 +08:00
fit2cloud-chenyw
c94c02f24b
Merge pull request #558 from dataease/pr@dev@feat_aksk 
feat: 添加ak,sk
 2021-08-09 16:04:02 +08:00
fit2cloud-chenyw
bb711fb406 feat: 添加ak,sk 2021-08-09 16:01:29 +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
wangjiahao
d46a40dcd2 feat:仪表板联动设置浮层 2021-08-06 17:24:17 +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
49ce82cac7 refactor:临时提交 2021-08-05 18:41:47 +08:00
wangjiahao
3a2bb24ca8 refactor:设置弹出框优化 2021-08-05 16:54:47 +08:00
wangjiahao
ad42815ca2 refactor:图片修改为自适应，不保持宽高比例 2021-08-05 13:47:48 +08:00
junjie
5ae6475da7 refactor: 指标卡样式选项优化 2021-08-05 11:19:06 +08:00
fit2cloud-chenyw
ed0f59097a feat: dev版本号升1.2.0 2021-08-05 10:11:00 +08:00
wangjiahao
9dd6e403c6 refactor:仪表板联动目标视图获取方式优化 2021-08-04 21:44:50 +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
ae520246bd refactor:仪表板编辑入口鼠标悬浮去掉颜色变化 2021-08-03 18:50:42 +08:00
wangjiahao
94be9ecb25 refactor:仪表板联动设置按钮样式调整 2021-08-03 18:45:42 +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
wangjiahao
52990c9684 refactor:更换仪表板视图设置组件 2021-08-03 15:49:04 +08:00
junjie
4b039160e3 fix: 字段编辑修复 2021-08-03 14:51:52 +08:00
fit2cloud-chenyw
721c5858e8
Merge pull request #492 from dataease/pr@dev@fix_国际化冲突 
fix: 解决国际化冲突
 2021-08-03 14:05:19 +08:00
fit2cloud-chenyw
94d716d1bc fix: 解决国际化冲突 2021-08-03 14:03:34 +08:00
junjie
bb58d690dc refactor: 编辑字段样式调整 2021-08-03 13:48:14 +08:00
wangjiahao
b0905f98d2 fix:仪表板样式修改保存按钮还是灰的问题 2021-08-03 13:25:27 +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
王嘉豪
355b780579
Merge pull request #484 from dataease/pr@dev@feat_panel-view-set-bar 
refactor:明细弹出样式修改
 2021-08-03 12:06:25 +08:00
wangjiahao
d61795898c refactor:明细弹出样式修改 2021-08-03 12:05:29 +08:00
junjie
e8fa584d47 fix: 雷达图数据结构 2021-08-03 11:50:15 +08:00
王嘉豪
1ebb5690a8
Merge pull request #480 from dataease/pr@dev@feat_panel-view-set-bar 
feat:预览界面点击组件显示设置入口，点击空白也取消设置入口；去掉原有鼠标移入显示的样式
 2021-08-03 11:33:37 +08:00
wangjiahao
7960180858 feat:预览界面点击组件显示设置入口，点击空白也取消设置入口；去掉原有鼠标移入显示的样式 2021-08-03 11:31:17 +08:00
wangjiahao
2bbca0e525 feat:组件预览入口修改为悬浮蓝色悬浮框展示 2021-08-03 11:29:32 +08:00
fit2cloud-chenyw
b09bf1ca54 refactor: 优化token过期提示框 2021-08-03 11:28:45 +08:00
wangjiahao
e4e0eef948 feat:增加组件的悬浮工具入口 2021-08-03 11:28:12 +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
fit2cloud-chenyw
ee234898cd
Merge pull request #470 from dataease/pr@dev@fix_token过期 
fix: token过期点击确定没有跳转到登录
 2021-08-02 18:28:22 +08:00
junjie
2772d78e78 fix: 关联字段数据集及时刷新 2021-08-02 18:27:10 +08:00
fit2cloud-chenyw
f9493fe2d7 fix: token过期点击确定没有跳转到登录 2021-08-02 18:27:03 +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
wangjiahao
e534b31f8e refactor:延长模板相关api超时时间 2021-07-30 13:55:35 +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
fit2cloud-chenyw
162ba5f48b fix: 前端插件(角色组织)字体文件404错误 2021-07-30 11:09:44 +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
8a2069c32a Merge branch 'dev' of github.com:dataease/dataease into dev 2021-07-29 14:51:40 +08:00
taojinlong
bfc646d3a3 fix: 页面loading 效果 2021-07-29 14:51:27 +08:00
王嘉豪
99c099c3d9
Merge pull request #406 from dataease/pr@dev@feat_panel-preview-shadow 
feat:仪表板预览模式下鼠标悬浮阴影效果
 2021-07-29 13:02:36 +08:00
wangjiahao
4bfd7b2ca2 feat:仪表板预览模式下鼠标悬浮阴影效果 2021-07-29 12:46:54 +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
fit2cloud-chenyw
4a2867ee50 fix: 头部消息数字错位 2021-07-28 19:02:04 +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
wangjiahao
aa2a1c7864 refactor:代码格式化 2021-07-28 14:30:31 +08:00
wangjiahao
6dbed17bf8 refactor:代码格式化 2021-07-28 14:16:01 +08:00
王嘉豪
8102e564e2
Merge pull request #374 from dataease/pr@dev@fix_panel_edit-close 
fix:关闭仪表板编辑界面时清空画布缓存，修复过滤组件回显问题
 2021-07-28 13:49:36 +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
wangjiahao
f0447a5f92 fix:关闭仪表板编辑界面时清空画布缓存，修复过滤组件回显问题 2021-07-28 12:46:49 +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
wangjiahao
5d97212c50 fix:过滤组件参数变动也可以进行保存 2021-07-28 11:30:53 +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
a6a24db963 perf: 地图坐标json使用缓存 2021-07-27 18:04:04 +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
fc5c3dcc03 feat: 下拉列表增加全部选项 2021-07-27 15:04:56 +08:00
wangjiahao
009c6ac9d0 refactor:修复仪表板矩形悬浮框部分样式设置 2021-07-27 14:42:00 +08:00
wangjiahao
c0e86e6e30 fix:修复仪表板view弹出菜单，控制台中有错误日志问题 2021-07-27 14:04:57 +08:00
fit2cloud-chenyw
6718d15cf0 fix: 跳转任务消息延时 2021-07-27 12:30:29 +08:00
wangjiahao
6407b278ea fix:预览模式下部分尺寸的显示屏仪表板抖动问题 2021-07-27 11:37:31 +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
wangjiahao
26247568e0 refactor:修改视图悬浮图标 2021-07-26 14:58:43 +08:00
wangjiahao
48b037e237 fix:全屏预览模式下日期控件下拉不显示问题 2021-07-26 14:46:55 +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
af5475465f
Merge pull request #301 from dataease/pr@dev@task 
feat: 调整定时任务
 2021-07-23 11:33:04 +08:00
taojinlong
0415c14c51 feat: 更改历史任务状态 2021-07-23 11:32:09 +08:00
wangjiahao
b2ea0c7123 fix:修复编辑过滤组件时，悬浮组件依然在遮罩上方 2021-07-23 11:30:33 +08:00
wangjiahao
747e79ebe9 fix:矩阵设计模式下点击一次组件也不需保存镜像 2021-07-23 11:26:40 +08:00
王嘉豪
364c748d5f
Merge pull request #302 from dataease/pr@dev@fix_panel_edit-matrix 
fix:矩阵设计模式下点击一次组件也不需保存镜像
 2021-07-23 11:14:32 +08:00
wangjiahao
01c4684e01 fix:矩阵设计模式下点击一次组件也不需保存镜像 2021-07-23 11:12:54 +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
fit2cloud-chenyw
66335c3880 fix: 添加菜单滚动条 2021-07-23 10:46:35 +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
wangjiahao
a0174c77e4 feat:仪表板矩形组件增加边框弧度设置 2021-07-22 14:05:41 +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
XiaJunjie2020
0f5209173f
Merge pull request #280 from dataease/pr@dev@refactor_视图样式调整 
refactor: 视图样式调整
 2021-07-22 12:08:50 +08:00
junjie
acace5e57d refactor: 视图样式调整 2021-07-22 12:07:17 +08:00
wangjiahao
8b435075ca Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	frontend/src/components/canvas/components/RectangleAttr.vue
 2021-07-22 11:46:03 +08:00
wangjiahao
b71a1d0a29 feat:仪表板矩形组件增加透明度样式设置 2021-07-22 11:44:57 +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
cafca05eee feat:仪表板矩形组件增加透明度样式设置 2021-07-22 10:20:38 +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
fit2cloud-chenyw
62ef6d01af
Merge pull request #273 from dataease/pr@dev@fix_菜单滚动条 
fix: 添加菜单滚动条
 2021-07-21 17:56:53 +08:00
fit2cloud-chenyw
08f1e10654 fix: 添加菜单滚动条 2021-07-21 17:53:36 +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
f1e25099a7 fix:增加仪表板，视图等请求超时时间 2021-07-19 11:54:33 +08:00
fit2cloud-chenyw
0589488167 fix: 默认请求超时时间10s 2021-07-19 11:24:18 +08:00
fit2cloud-chenyw
aca2a9b19f feat: 前端增加token免续命白名单 2021-07-19 11:08:00 +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