Commit Graph

1786 Commits

Author SHA1 Message Date
fit2cloud-chenyw
84808a6e96 feat: 添加测试地图 2021-07-13 18:44:33 +08:00
taojinlong
8d144a4868
Merge pull request #231 from dataease/pr@dev@fix-task
fix: 执行记录状态修改;执行记录显示错误;简单执行增加描述
2021-07-13 18:35:07 +08:00
taojinlong
e42b8b73ab fix: 执行记录状态修改;执行记录显示错误;简单执行增加描述 2021-07-13 18:34:17 +08:00
王嘉豪
bfdb77fa8d
Merge pull request #230 from dataease/pr@dev@panel
feat:仪表板编辑不再使用右键操作,统一在组件右上角添加设置入口
2021-07-13 18:13:43 +08:00
wangjiahao
b11db93328 feat:仪表板编辑不再使用右键操作,统一在组件右上角添加设置入口 2021-07-13 18:11:42 +08:00
XiaJunjie2020
eaea27ea3d
Merge pull request #229 from dataease/pr@dev@feat_数据关联关系修改
feat: 数据关联改为左连接等方式
2021-07-13 15:58:43 +08:00
junjie
54820d6746 feat: 数据关联改为左连接等方式 2021-07-13 15:55:22 +08:00
XiaJunjie2020
0188ca497c
Merge pull request #223 from dataease/pr@dev@feat_excel上传后可修改字段类型再保存
feat: excel上传后可编辑字段类型再保存
2021-07-13 12:33:13 +08:00
junjie
ccd07cc85a feat: excel上传后可编辑字段类型再保存 2021-07-13 12:32:20 +08:00
王嘉豪
5a2a5830b1
Merge pull request #222 from dataease/pr@dev@panel
feat:编辑保存,放大效果等文案修改
2021-07-13 12:13:48 +08:00
wangjiahao
ab7c33c82a feat:编辑保存,放大效果等文案修改 2021-07-13 12:13:17 +08:00
王嘉豪
bf29a9bc1c
Merge pull request #220 from dataease/pr@dev@panel
fix:仪表板复制视图时特殊情况出现重名的问题
2021-07-13 10:35:39 +08:00
wangjiahao
15ce253f4c fix:仪表板复制视图时特殊情况出现重名的问题 2021-07-13 10:34:44 +08:00
XiaJunjie2020
afcc88f4fc
Merge pull request #219 from dataease/pr@dev@fix_数据集编辑后空白
fix: 数据集编辑后空白
2021-07-12 19:28:30 +08:00
junjie
4f9abf5af6 fix: 数据集编辑后空白 2021-07-12 19:27:34 +08:00
XiaJunjie2020
381febe4cb
Merge pull request #218 from dataease/pr@dev@fix_数据集字段类型浮点转整型
fix: 数据集字段浮点转整型
2021-07-12 18:58:46 +08:00
junjie
131eb3e353 fix: 数据集字段浮点转整型 2021-07-12 18:57:51 +08:00
taojinlong
ae0efc3873
Merge pull request #217 from dataease/pr@dev@excelType
feat: 根据预览的前100行推断excel类型
2021-07-12 18:40:16 +08:00
taojinlong
d611114f8d feat: 根据预览的前100行推断excel类型 2021-07-12 18:39:34 +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
wangjiahao
b682063992 fix:仪表板保存直接退出问题 2021-07-12 17:28:26 +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
王嘉豪
c4ec8c1413
Merge pull request #214 from dataease/pr@dev@panel
feat:【仪表板】仪表板修改后未保存,点击关闭弹出消息框来确认是否保存
2021-07-12 16:58:01 +08:00
wangjiahao
e3ffac5d97 feat:【仪表板】仪表板修改后未保存,点击关闭弹出消息框来确认是否保存 2021-07-12 16:51:39 +08:00
XiaJunjie2020
e8704a78bc
Merge pull request #213 from dataease/pr@dev@refactor_SQL拼接
refactor: SQL拼接
2021-07-12 16:36:17 +08:00
junjie
ad23936022 refactor: SQL拼接 2021-07-12 16:35:03 +08:00
XiaJunjie2020
250b9b89c7
Merge pull request #212 from dataease/pr@dev@refactor_SQL调整
refactor: SQL拼接
2021-07-12 15:54:31 +08:00
junjie
6611d4de50 refactor: SQL拼接 2021-07-12 15:53:40 +08:00
XiaJunjie2020
963ccbb222
Merge pull request #211 from dataease/pr@dev@refactor_前端接口调整
refactor: 前端接口调整
2021-07-12 15:31:45 +08:00
junjie
8cd08e7171 refactor: 前端接口调整 2021-07-12 15:28:52 +08:00
fit2cloud-chenyw
ebc985dd07
Merge pull request #210 from dataease/pr@dev@fix_中文输入法回车键保存
fix: 中文输入法回车键直接保存
2021-07-12 15:19:28 +08:00
fit2cloud-chenyw
7b993b609a fix: 中文输入法回车键直接保存 2021-07-12 15:15:19 +08:00
XiaJunjie2020
c4720e8986
Merge pull request #209 from dataease/pr@dev@refactor_SQL拼接
refactor: 底层SQL拼接
2021-07-12 15:14:17 +08:00
junjie
6401d1277a refactor: 底层SQL拼接 2021-07-12 15:13:22 +08:00
fit2cloud-chenyw
d02f249b8b
Merge pull request #208 from dataease/pr@dev@fix_组织名称验重
fix: 组织名称验重
2021-07-12 14:56:56 +08:00
fit2cloud-chenyw
849450dbe8 fix: 组织名称验重 2021-07-12 14:47:25 +08:00
XiaJunjie2020
426731ef35
Merge pull request #207 from dataease/pr@dev@refactor_底层SQL拼接
refactor: 底层SQL拼接
2021-07-12 14:34:34 +08:00
junjie
79151c4fbe refactor: 底层SQL拼接 2021-07-12 14:32:01 +08:00
taojinlong
fb186e9cff
Merge pull request #206 from dataease/pr@dev@refactor
refactor: 去掉无用代码
2021-07-12 13:19:08 +08:00
taojinlong
4d57f23c1d refactor: 去掉无用代码 2021-07-12 13:17:59 +08:00
taojinlong
a2a131d925
Merge pull request #205 from dataease/pr@dev@errormsg
feat(错误信息): 抽取数据的错误信息仅显示错误基本描述
2021-07-12 11:49:50 +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
3f15bf573a feat: 去掉unused引用 2021-07-12 11:37:47 +08:00
fit2cloud-chenyw
b329f894d1 feat: 完善消息接收设置 2021-07-12 11:30:57 +08:00
XiaJunjie2020
cf2623a7b6
Merge pull request #204 from dataease/pr@dev@feat_底层sql代码优化
feat: 数据集视图底层sql拼接使用stg重构(mysql部分)
2021-07-10 10:50:49 +08:00
junjie
d58b06928e feat: 数据集视图底层sql拼接使用stg重构(mysql部分) 2021-07-10 10:47:47 +08:00