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

1508 Commits

Author SHA1 Message Date
taojinlong
4a7d8efe7c feat: 行权限支持"与/或" 2021-12-14 16:27:32 +08:00
junjie
81a2b4753e feat(视图): 过滤器支持and、or逻辑 2021-12-14 15:26:33 +08:00
taojinlong
4683181a6b refactor: 回退 2021-12-14 15:20:44 +08:00
taojinlong
fc5bbd3689 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-14 15:07:06 +08:00
taojinlong
82a5e142d2 fxi: 定时同步 db2 2021-12-14 15:06:47 +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
d11021934b feat(视图): 行权限 2021-12-14 11:35:35 +08:00
junjie
f4d81ef552 feat: 行权限构建 2021-12-14 11:10:04 +08:00
junjie
9505e3101b feat: 行权限构建 2021-12-14 11:09:38 +08:00
junjie
955d72cb75 feat(视图): 过滤器支持and、or逻辑 2021-12-14 10:14:02 +08:00
junjie
def246cc54 fix: rollback 2021-12-13 17:50:25 +08:00
junjie
6cb70f33a5 feat(视图): 过滤器支持and、or逻辑 2021-12-13 16:38:22 +08:00
taojinlong
87ea43b09d fxi: sql 拼接 2021-12-10 23:37:01 +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
deb5456d91 refactor(视图): 指标结果优化 2021-12-10 11:01:26 +08:00
junjie
bfa247cbc3 feat(视图): 同比环比 2021-12-10 10:43:34 +08:00
junjie
bcabbf905d feat(视图): 同比环比 2021-12-09 18:32:30 +08:00
fit2cloud-chenyw
12878873c3 feat: 定时报告镜像测试 2021-12-09 17:58:41 +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
fit2cloudrd
dbd782e62d
fix: 修复mysql8.0 flyway执行失败问题 
* fix: 修复mysql8.0 flyway执行失败问题

* fix: 修复mysql8.0 flyway执行失败问题

Co-authored-by: wangjiahao <1522128093@qq.com>
 2021-12-09 10:53:24 +08:00
fit2cloud-chenyw
d7f1bbbd48 feat: 新增移动端个人中心 2021-12-08 17:40:06 +08:00
taojinlong
94cb9b45e6 feat: 数据集行权限 2021-12-08 17:18:35 +08:00
fit2cloud-chenyw
38c2007bb9 refactor: 规范代码 2021-12-07 18:39:08 +08:00
fit2cloud-chenyw
6357941bc6 fix: 第三方iframe嵌入公共链接 2021-12-07 18:38:40 +08:00
fit2cloud-chenyw
322e5c7c7d
Merge pull request #1410 from dataease/pr@dev@feat_mobile_api 
feat: 新增移动端目录api
 2021-12-07 18:31:13 +08:00
fit2cloud-chenyw
aee31d0d62 feat: 新增移动端目录api 2021-12-07 18:29:08 +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
b4c453b4b5 refactor: 数据关联优化 2021-12-07 16:23:20 +08:00
taojinlong
c51a41da34 fix: sql 拼接错误 2021-12-06 16:59:54 +08:00
fit2cloud-chenyw
75cd6ec371 feat: 新增移动端接口 2021-12-03 18:23:28 +08:00
junjie
d8a0212a35 feat(数据集): 关联数据集 2021-12-02 18:33:49 +08:00
junjie
a1909f59cd feat(数据集): 关联数据集 2021-12-02 17:54:56 +08:00
junjie
4a8bfefac4 feat(数据集): 关联数据集 2021-12-02 16:40:14 +08:00
junjie
acb54573cb feat(数据集): 关联数据集 2021-12-02 14:58:42 +08:00
taojinlong
6c9b3882ba fix: 处理 excel 数据 2021-12-01 21:43:17 +08:00
taojinlong
244e895195 fix: 过滤掉没有列名的 sheet 页面 2021-12-01 17:15:04 +08:00
junjie
7f949fbc83 refactor(数据集): 优化数据集数据预览报错信息 2021-12-01 11:45:59 +08:00
junjie
56cafbd586 feat(权限): 统一授权数据集tree 2021-11-30 16:30:36 +08:00
junjie
68f6a6e749 fix(权限): 统一授权数据集tree 2021-11-30 13:38:50 +08:00
wangjiahao
700fe805af refactor: 增加权限模型字段优化查询条件 2021-11-30 11:05:39 +08:00
taojinlong
296d1813ee fix: sqlserver 增量sql 2021-11-29 18:50:07 +08:00
taojinlong
1df9c12c60 fix: 识别 bit 字段长度 2021-11-29 18:22:47 +08:00
taojinlong
63d3e5d015 feat(数据集): 添加同步任务时，过滤掉空目录 2021-11-29 17:48:41 +08:00
wangjiahao
521b35f9b5 refactor: 优化系统响应速度 2021-11-29 11:35:51 +08:00
junjie
c73fbfb91c fix(数据集): 编辑数据集可能会出现重复字段 2021-11-29 10:12:41 +08:00
王嘉豪
5a048e9e2e
Merge pull request #1294 from dataease/pr@dev@fix_panel-edit 
refactor: 优化数据集查询树
 2021-11-26 18:24:17 +08:00
wangjiahao
8c7d12e6d6 refactor: 优化数据集查询树 2021-11-26 18:23:26 +08:00
王嘉豪
d9cd58a8e8
Merge pull request #1293 from dataease/pr@dev@fix_panel-edit 
refactor: 优化数据集查询树
 2021-11-26 18:17:12 +08:00
wangjiahao
298b2cbe6f refactor: 优化数据集查询树 2021-11-26 18:15:42 +08:00
fit2cloud-chenyw
f1516f5b83 refactor: 公共链接方法名称 2021-11-26 14:32:22 +08:00
fit2cloud-chenyw
c496b65e9e fix: 放开excel上传api 2021-11-26 14:05:23 +08:00
fit2cloud-chenyw
7a0aebcd77 fix: token验签逻辑错误 2021-11-26 13:47:17 +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
fit2cloud-chenyw
26c54d41bc fix: 前端改为单页面应用 2021-11-26 11:38:25 +08:00
taojinlong
f8f285155d Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-25 22:02:15 +08:00
taojinlong
1c058ad8b0 fix(数据集): 识别 hive 字段类型 2021-11-25 22:02:04 +08:00
wangjiahao
1eeda595f1 refactor: 优化数据集查询 2021-11-25 15:17:00 +08:00
wangjiahao
995dd148df refactor: 更新flyway 2021-11-25 14:09:53 +08:00
wangjiahao
b7bd9e6177 refactor: 添加flyway 2021-11-25 11:23:35 +08:00
junjie
56169e3d24 feat(数据集):数据集字段管理页面，增加同步字段功能 2021-11-25 10:10:57 +08:00
wangjiahao
483bd8f0b1 refactor: 树形列表统一使用拼音排序规则 2021-11-24 18:42:16 +08:00
wangjiahao
c15c58f63d feat: 增加授权模型统一查询功能，视图使授权模型查询 2021-11-24 18:14:41 +08:00
xuwei-fit2cloud
9e87a08a5b refactor: 设定flyway中数据表编码 2021-11-24 16:56:56 +08:00
taojinlong
8a3a793cbe refactor: 整理 sql 2021-11-24 16:21:49 +08:00
fit2cloud-chenyw
1f4a2a6d3a fix: 定时报告flyway逻辑错误 2021-11-24 12:09:16 +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
fit2cloud-chenyw
e7b413582e refactor: 格式化代码 2021-11-24 10:32:29 +08:00
fit2cloud-chenyw
fb6347b4ea feat: 定时报告sql语句 2021-11-23 18:50:11 +08:00
fit2cloud-chenyw
cdf75963b6
Merge branch 'dev' into pr@dev@feat_xpack定时报告自测版本 2021-11-23 18:40:40 +08:00
fit2cloud-chenyw
09d6cc7103 feat: 定时报告自测版本 2021-11-23 18:37:32 +08:00
taojinlong
99dcfa8511 refactor: 整理 sql 2021-11-23 17:38:55 +08:00
taojinlong
7f9430787f refactor: 使变量名符合代码规范 2021-11-23 16:49:20 +08:00
taojinlong
86b81f6a77 fix: hive 数据源字段识别 2021-11-23 16:36:58 +08:00
taojinlong
4fd1063e45 feat: 读出据库数据集的的 comment 属性 2021-11-23 16:36:26 +08:00
taojinlong
6e8020b148 refactor: 格式化代码 2021-11-22 18:34:49 +08:00
taojinlong
e50158bc57 feat(数据集): 行权限 2021-11-22 15:40:29 +08:00
fit2cloud-chenyw
0320c94e6d feat: 整合邮件和截图 2021-11-21 20:23:45 +08:00
fit2cloud-chenyw
0adea9c6d8
Merge branch 'dev' into pr@dev@feat_chrome_screenshot 2021-11-20 22:13:52 +08:00
fit2cloud-chenyw
527446de2e feat: 继续完善定时报告 2021-11-20 22:11:27 +08:00
fit2cloud-chenyw
7666335e43 feat: 新增定时报告 2021-11-19 18:44:58 +08:00
junjie
ca5fa388d8 fix:sqlserver计算字段bug 2021-11-16 14:54:18 +08:00
junjie
daa19674ba fix:sqlserver计算字段bug 2021-11-16 14:54:00 +08:00
xuwei-fit2cloud
a8935a49a0 refactor: 删除不必要的代码 2021-11-16 11:01:38 +08:00
wangjiahao
329107c9e3 Merge remote-tracking branch 'origin/dev' into dev 2021-11-15 18:28:51 +08:00
wangjiahao
ca6e0ae3e6 refactor:代码回退 2021-11-15 18:28:21 +08:00
fit2cloud-chenyw
772de9e6dd refactor: 删除非必要注释 2021-11-15 16:51:45 +08:00
王嘉豪
aa69d3ebdc
Merge pull request #1205 from dataease/pr@dev@refactor_panel 
refactor:仪表板视图联动，使用相同数据集的视图，自动补充联动字段
 2021-11-15 16:24:55 +08:00
wangjiahao
0ce07f4325 refactor:仪表板视图联动，使用相同数据集的视图，自动补充联动字段 2021-11-15 16:24:03 +08:00
fit2cloud-chenyw
5ce64f0d09 feat: 消息订阅增加邮件渠道 2021-11-15 16:23:24 +08:00
taojinlong
566a317005 feat: 行权限 2021-11-15 15:53:40 +08:00
fit2cloud-chenyw
17a3b79e5b feat: 完善公共链接 2021-11-11 16:56:54 +08:00
taojinlong
01e23ef5c2 feat: 支持 hive 数据源 2021-11-11 09:58:48 +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
fb533cde83 feat(视图):视图保留实时计算与渲染功能，但不实时保存，提供保存与重置按钮 2021-11-10 17:10:49 +08:00
junjie
3439988ca2 feat(视图):视图保留实时计算与渲染功能，但不实时保存，提供保存与重置按钮 2021-11-10 15:30:21 +08:00
junjie
902ac5bb7a feat(视图):视图保留实时计算与渲染功能，但不实时保存，提供保存与重置按钮 2021-11-10 13:44:08 +08:00
fit2cloud-chenyw
db55c0782a feat: 新增我分享的 2021-11-09 18:23:45 +08:00
fit2cloud-chenyw
12c8578d11 feat: 新增后台仪表板截图 2021-11-09 16:39:21 +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
6a62267d8d refactor:优化授权查询模型 2021-11-09 11:08:47 +08:00
wangjiahao
f32ba3be80 feat:仪表板新增视频组件 2021-11-08 19:03:09 +08:00
fit2cloud-chenyw
4200bcf1d4 refactor: 重构提示信息 2021-11-06 15:46:40 +08:00
fit2cloud-chenyw
e0ae23fb07 refactor: 重构代码 2021-11-06 15:33:51 +08:00
junjie
fb37a033c8 refactor: 编辑数据集，字段不会删除重建 2021-11-04 12:34:33 +08:00
taojinlong
9fa66031e8 fix: pg 时间类型转换 2021-11-04 12:01:17 +08:00
taojinlong
788331ee60 fix: redshift sql 2021-11-03 11:57:26 +08:00
xiajunjie
8088f6ae2a fix: rollback，数据集处的doris仍需要分页 2021-11-02 19:55:25 +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
fit2cloud-chenyw
39d240d6b0 refactor: 主题另存为功能 2021-11-02 15:20:18 +08:00
fit2cloud-chenyw
a4683eca0d fix: 修复系统管理api 2021-11-02 13:45:36 +08:00
wangjiahao
3c2d01e7e6 Merge remote-tracking branch 'origin/dev' into dev 2021-11-02 10:16:22 +08:00
wangjiahao
efe3ba2319 fix:仪表板复制视图没有复制下钻字段的问题 2021-11-02 10:15:54 +08:00
taojinlong
14ea9837b6 refactor: 规范代码结构 2021-11-01 18:51:59 +08:00
taojinlong
8935dd2e07 refactor: 规范代码结构 2021-11-01 18:48:25 +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
taojinlong
74b4a3cc56 refactor: 恢复代码 2021-11-01 17:22:34 +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
junjie
fd253a7c26 refactor: 数据集名称字段长度 2021-11-01 14:42:50 +08:00
fit2cloud-chenyw
2395741707 feat: 用户管理姓名字段增加重复验证 2021-11-01 14:32:08 +08:00
junjie
b1a6fe4f9f fix:flyway 2021-11-01 14:21:54 +08:00
fit2cloud-chenyw
ab28111e18 fix: ldap用户姓名为空 2021-11-01 12:49:45 +08:00
junjie
bc4ef29bd2 feat:视图默认返回1000条数据；doris默认不排序 2021-11-01 12:39:57 +08:00
fit2cloud-chenyw
a74f09cc10 fix: ldap忽略大小写 2021-11-01 12:18:36 +08:00
wangjiahao
02f4d5bba0 fix:仪表板跳转配置时，删除仪表板ID还在配置选项的问题 2021-11-01 11:10:18 +08:00
fit2cloud-chenyw
bdecf25684 fix: 仪表板链接跳转配置白名单 2021-11-01 10:33:30 +08:00
fit2cloud-chenyw
c707942f96
Merge pull request #1068 from dataease/pr@v1.3@fix_公共链接弹框 
Pr@v1.3@fix 公共链接弹框
 2021-10-31 02:28:14 +08:00
fit2cloud-chenyw
ce9127be33 fix: 公共链接弹框 2021-10-31 02:26:19 +08:00
fit2cloud-chenyw
47a481f903 feat: 自定义主题sql 2021-10-31 02:11:20 +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
2889668ca9 fix:跳转连接不生效问题 2021-10-29 18:21:36 +08:00
wangjiahao
5ce24a47b2 refactor:仪表板跳转优化，样式调整，国际化等 2021-10-29 12:53:25 +08:00
wangjiahao
d9071fdc52 refactor:代码回退 2021-10-28 18:36:05 +08:00
王嘉豪
4d3ffc794d
Merge branch 'dev' into pr@dev@refactor_panel-edit 2021-10-28 18:12:52 +08:00
wangjiahao
26b601ae53 fix:视图复制名称过长报错问题 2021-10-28 18:10:55 +08:00
王嘉豪
b7e70dd79b
Merge pull request #1044 from dataease/pr@dev@refactor_panel-edit 
refactor:仪表板排序名称优先
 2021-10-28 18:06:52 +08:00
wangjiahao
5f1ada2865 refactor:仪表板排序名称优先 2021-10-28 18:05:28 +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
taojinlong
129e101453 feat: 支持CTE语法 2021-10-26 12:05:06 +08:00
fit2cloud-chenyw
c8a0fe4d36 feat: 后台开启gzip压缩 2021-10-25 17:02:36 +08:00
taojinlong
1ef965357d feat: 登录时，对用户名密码加密 2021-10-25 15:36:51 +08:00
taojinlong
042f447286 refactor: 优化一下 2021-10-25 14:48:18 +08:00
taojinlong
54ef74ff4b feat: 支持mongodb 2021-10-25 12:22:01 +08:00
fit2cloud-chenyw
82361e0f90 fix: 消息列表分页错误 2021-10-22 15:55:29 +08:00
fit2cloud-chenyw
b609955a44 feat: 增加超时时间配置 2021-10-22 15:06:50 +08:00
taojinlong
af1dc6cb6c Merge branch 'dev' of github.com:dataease/dataease into dev 2021-10-21 15:30:13 +08:00
taojinlong
8e50280de8 refactor: 优化一下 2021-10-21 15:30:04 +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
taojinlong
e347ef31ff fix: es 支持https 2021-10-21 12:38:58 +08:00
taojinlong
7f3f550304 feat: 支持mongo 2021-10-21 12:38:44 +08:00
taojinlong
54dcf9ee1a fix: es 支持https 2021-10-21 12:37:17 +08:00
taojinlong
a59712e6a0 fix: pg 时间格式化错误 2021-10-20 17:46:15 +08:00
taojinlong
9ce5192386 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-10-20 17:44:27 +08:00
taojinlong
07c987d506 fix: pg 时间格式化错误 2021-10-20 17:44:16 +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
taojinlong
f11b1e2dbb fix: 识别 es 版本 2021-10-19 18:16:03 +08:00
taojinlong
38c3d8fd7e fix: 识别 es 版本 2021-10-19 18:14:13 +08:00
taojinlong
1046e09c98 fix: 识别excel类型 2021-10-19 17:50:27 +08:00
taojinlong
436fc108a0 fix: 指定 parent classloader; 2021-10-19 17:07:07 +08:00
taojinlong
72292055c6 fix: 识别 ck 字段类型 2021-10-18 18:53:21 +08:00
taojinlong
66f3d43c5a fix: 识别 ck 字段类型 2021-10-18 18:52:57 +08:00
taojinlong
554fc3840a fix: 识别 ck 字段类型 2021-10-18 17:48:59 +08:00
taojinlong
f1c6de498a Merge branch 'dev' of github.com:dataease/dataease into dev 2021-10-18 17:46:38 +08:00
taojinlong
11384ff164 fix: 识别 ck 字段类型 2021-10-18 17:45:43 +08:00
fit2cloud-chenyw
8e573ba179 feat: 增加消失超时默认30天 2021-10-18 11:31:23 +08:00
taojinlong
bb290704be fix: 导入excel识别时间类型 2021-10-15 13:29:17 +08:00
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
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
5439fe9f07 fix: 前端打包icon错误 2021-10-15 11:03:57 +08:00
fit2cloud-chenyw
ab1c6f514d fix: 前端打包icon错误 2021-10-15 10:59:40 +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
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