Commit Graph

2005 Commits

Author SHA1 Message Date
王嘉豪
d8fb6643cc
Merge pull request #434 from dataease/pr@dev@refactor_tempalte-api-timeout
refactor:延长模板相关api超时时间
2021-07-30 13:57:06 +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
XiaJunjie2020
84f42e06e2
Merge pull request #432 from dataease/pr@dev@refactor_视图样式优化
refactor: 视图样式优化
2021-07-30 12:48:02 +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
XiaJunjie2020
09e29e37b7
Merge pull request #429 from dataease/pr@dev@refactor_视图更换数据集优化
refactor: 视图更换数据集优化
2021-07-30 11:56:01 +08:00
junjie
6cc9cc14e4 refactor: 视图更换数据集优化 2021-07-30 11:54:45 +08:00
王嘉豪
82431c2393
Merge pull request #428 from dataease/pr@dev@refactor-panle-edit-overflow
refactor:仪表板自适应模式下,去掉滚动条
2021-07-30 11:49: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
王嘉豪
49aaf376e7
Merge pull request #424 from dataease/pr@dev@refactor_view-copy-dev
refactor:仪表板名称限制在50字符内
2021-07-30 10:31:54 +08:00
wangjiahao
22ff43afc9 refactor:仪表板名称限制在50字符内 2021-07-30 10:30:31 +08:00
王嘉豪
632da163ce
Merge pull request #423 from dataease/pr@dev@refactor_view-copy-dev
refactor:优化视图明细导出,导出excel中不需要合计
2021-07-30 10:29:54 +08:00
wangjiahao
d641d71753 refactor:优化视图明细导出,导出excel中不需要合计 2021-07-30 10:26:34 +08:00
fit2cloudrd
b06ba1d5ae
Update README.md 2021-07-29 23:29:33 +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
4a5f868090
Merge pull request #414 from dataease/pr@dev@refactor_公共连接分享使用独立拦截器
refactor: 查看分享链接使用独立拦截器
2021-07-29 16:47:59 +08:00
fit2cloud-chenyw
bcd786c48c refactor: 查看分享链接使用独立拦截器 2021-07-29 16:46:17 +08:00
XiaJunjie2020
7beb636ff4
Merge pull request #413 from dataease/pr@dev@feat_数据集字段支持公式运算等(UI和CRUD)
feat(数据集): 数据集字段支持公式运算等操作(UI和CRUD)
2021-07-29 16:33:25 +08:00
junjie
243dacc959 feat(数据集): 数据集字段支持公式运算等操作(UI和CRUD) 2021-07-29 16:31:49 +08:00
taojinlong
3db9e41108 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-07-29 16:17:14 +08:00
taojinlong
42b8840a58 fix: 校验 excel 空单元格 2021-07-29 16:17:03 +08:00
XiaJunjie2020
46f56cc576
Merge pull request #412 from dataease/pr@dev@feat_数据集字段支持公式运算等(UI和CRUD)
feat(数据集): 数据集字段支持公式运算等操作(UI和CRUD)
2021-07-29 16:00:57 +08:00
junjie
e0c23d5211 feat(数据集): 数据集字段支持公式运算等操作(UI和CRUD) 2021-07-29 15:56:59 +08:00
XiaJunjie2020
70cacc656a
Merge pull request #411 from dataease/pr@dev@feat_数据集字段管理支持公式函数等运算(UI与CRUD)
fix: 数据集切换页面权限问题
2021-07-29 15:31:27 +08:00
junjie
adf5f700f0 fix: 数据集切换页面权限问题 2021-07-29 15:29:25 +08:00
王嘉豪
c2fabb37e1
Merge pull request #410 from dataease/pr@vdev@refactor_flay-funtion
refactor:去掉数据库创建函数root用户限制
2021-07-29 15:28:01 +08:00
junjie
be0b530bfe feat(数据集): 数据集字段支持公式运算等操作(UI和CRUD) 2021-07-29 15:13:18 +08:00
junjie
b99d9e2d8b feat(数据集): 数据集字段支持公式运算等操作(UI和CRUD) 2021-07-29 15:12:29 +08:00
wangjiahao
ecd06677fb refactor:去掉数据库创建函数root用户限制 2021-07-29 15:09:53 +08:00
王嘉豪
def4161c88
Merge pull request #409 from dataease/pr@dev@fix_view-user-auth
fix:修复普通用户创建视图权限查不到的问题
2021-07-29 15:07:53 +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