Commit Graph

2950 Commits

Author SHA1 Message Date
taojinlong
25dbadffa8 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-10-15 12:05:56 +08:00
taojinlong
ea249d90e4 fix: 导入excel识别时间类型 2021-10-15 12:05:42 +08:00
XiaJunjie2020
9abba6cb6c
Merge pull request #949 from dataease/pr@dev@feat_g2
feat:antv
2021-10-15 11:57:28 +08:00
junjie
1f7c090fa8 feat:antv 2021-10-15 11:56:40 +08:00
fit2cloud-chenyw
84bbf977f4
Merge pull request #948 from dataease/pr@v1.3@fix_api_doc
Pr@v1.3@fix api doc
2021-10-15 11:16:36 +08:00
fit2cloud-chenyw
b3614a57d5 fix: 修改api文档地址 2021-10-15 11:14:04 +08:00
fit2cloud-chenyw
c70d555711
Merge pull request #946 from dataease/pr@v1.3@fix_front_package_error
fix: 前端打包icon错误
2021-10-15 11:05:04 +08:00
fit2cloud-chenyw
5439fe9f07 fix: 前端打包icon错误 2021-10-15 11:03:57 +08:00
fit2cloud-chenyw
440c6135b9
Merge pull request #945 from dataease/pr@dev@fix_front_package_error
fix: 前端打包icon错误
2021-10-15 11:00:47 +08:00
fit2cloud-chenyw
ab1c6f514d fix: 前端打包icon错误 2021-10-15 10:59:40 +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
taojinlong
18aa248f79 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-10-14 18:59:14 +08:00
taojinlong
7d208d48f5 feat: druid 替换 c3p0; 以类加载的方式引入数据源驱动;支持myqsl5.1 2021-10-14 18:55:08 +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
fit2cloud-chenyw
a77912afaa Merge branch 'dev' of fit2cloud:dataease/dataease into dev
fix: 打包后前端图标被过滤
2021-10-14 18:30:20 +08:00
fit2cloud-chenyw
79f25ab590 Merge branch 'dev' of fit2cloud:dataease/dataease into dev 2021-10-14 18:27:40 +08:00
taojinlong
972713272b Merge branch 'dev' of github.com:dataease/dataease into dev 2021-10-14 18:27:33 +08:00
taojinlong
3b0e88d8ad feat: druid 替换 c3p0; 以类加载的方式引入数据源驱动;支持myqsl5.1 2021-10-14 18:26:19 +08:00
fit2cloud-chenyw
fb4505d712 fix: 打包跳过前端图标 2021-10-14 18:24:23 +08:00
fit2cloud-chenyw
1af8667a93
Merge pull request #942 from dataease/pr@v1.3@fix_package_front
fix: 打包跳过前端图标
2021-10-14 18:21:33 +08:00
fit2cloud-chenyw
57d4f3fd2d fix: 打包跳过前端图标 2021-10-14 18:20:27 +08:00
XiaJunjie2020
25e0f55a12
Merge pull request #941 from dataease/pr@dev@feat_antv
feat:antv
2021-10-14 18:07:39 +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
fe263843a4
Merge pull request #939 from dataease/pr@dev@fix_1.3_leftover
Pr@dev@fix 1.3 leftover
2021-10-14 17:22:51 +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
fit2cloud-chenyw
238ce0f27a fix: api文档优化 2021-10-14 17:17:43 +08:00
王嘉豪
2d60cadea1
Merge pull request #937 from dataease/pr@dev@feat_panel-hyperlinks
feat:增加支持文本超链接
2021-10-14 16:46:44 +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
fit2cloud-chenyw
c274aece5b fix: 删除测试main方法 2021-10-14 14:40:41 +08:00
fit2cloudrd
21059d197d
Update README.md 2021-10-14 14:04:06 +08:00
maninhill
c06725a8ab
Update README.md 2021-10-14 11:55:56 +08:00
taojinlong
38fcb01999 fix: 识别es版本信息 2021-10-14 11:22:16 +08:00
taojinlong
3ad3ff8d50 fix: 识别es版本信息 2021-10-14 11:18:22 +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
xuwei-fit2cloud
3f8088d9b4 docs: 补充README 2021-10-13 17:46:42 +08:00
王嘉豪
c1521e7579
Merge pull request #930 from dataease/v1.3
V1.3
2021-10-13 17:39:39 +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
bb99450a41
Merge pull request #929 from dataease/pr@dev@fix_datae_range
fix: 日期范围组件颠倒开始时间结束时间
2021-10-13 16:59:56 +08:00