Commit Graph

3495 Commits

Author SHA1 Message Date
taojinlong
6c9b3882ba fix: 处理 excel 数据 2021-12-01 21:43:17 +08:00
王嘉豪
bbb5379922
Merge pull request #1367 from dataease/v1.5
V1.5
2021-12-01 20:24:43 +08:00
fit2cloud-chenyw
3b546a6f41 refactor: 前端eslint警告以及报错 2021-12-01 18:07:40 +08:00
fit2cloud-chenyw
a27474644a
Merge pull request #1366 from dataease/pr@v1.5@refactor_eslint_error
refactor: 前端eslint警告以及报错
2021-12-01 18:05:57 +08:00
fit2cloud-chenyw
df13bfa008 refactor: 前端eslint警告以及报错 2021-12-01 18:04:53 +08:00
王嘉豪
9ea9443722
Merge pull request #1365 from dataease/pr@1.5@refactor_panel-pdf
Pr@1.5@refactor panel pdf
2021-12-01 17:43:54 +08:00
taojinlong
bf3c13306e Merge branch 'v1.5' of github.com:dataease/dataease into v1.5 2021-12-01 17:43:33 +08:00
王嘉豪
79a84f062e
Merge pull request #1364 from dataease/refactor_panel-pdf
Merge remote-tracking branch 'origin/v1.5' into refactor_panel-pdf
2021-12-01 17:42:18 +08:00
wangjiahao
b86c93be7f Merge remote-tracking branch 'origin/v1.5' into refactor_panel-pdf 2021-12-01 17:40:53 +08:00
fit2cloud-chenyw
6f5c34fec1 fix: 条件组件新增失败 2021-12-01 17:40:20 +08:00
fit2cloud-chenyw
7be6d0eb6c
Merge pull request #1363 from dataease/pr@v1.5@fix_filter_add_miss
fix: 条件组件新增失败
2021-12-01 17:39:29 +08:00
wangjiahao
abb9f45698 refactor: 视图新建追加自动点击事件,当前新加视图高亮显示 2021-12-01 17:39:27 +08:00
fit2cloud-chenyw
6c8a2d7685 fix: 条件组件新增失败 2021-12-01 17:38:33 +08:00
taojinlong
011a27b408 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-01 17:15:13 +08:00
taojinlong
244e895195 fix: 过滤掉没有列名的 sheet 页面 2021-12-01 17:15:04 +08:00
taojinlong
b1245f1d08 Merge branch 'v1.5' of github.com:dataease/dataease into v1.5 2021-12-01 17:14:25 +08:00
taojinlong
b38d54e661 fix: 过滤掉没有列名的 sheet 页面 2021-12-01 17:14:16 +08:00
fit2cloud-chenyw
6d64ff4d43 fix: 文本列表多选切换单选无效 2021-12-01 17:08:39 +08:00
fit2cloud-chenyw
e7185a3ab8
Merge pull request #1362 from dataease/pr@v1.5@fix_文本列表切换多选
fix: 文本列表多选切换单选无效
2021-12-01 17:07:46 +08:00
fit2cloud-chenyw
784d5f335d fix: 文本列表多选切换单选无效 2021-12-01 17:06:51 +08:00
王嘉豪
b77bd09c40
Merge pull request #1361 from dataease/v1.5
V1.5
2021-12-01 16:49:40 +08:00
fit2cloud-chenyw
888b9da2a1 refactor: 去除时间控件外边框 2021-12-01 16:49:14 +08:00
王嘉豪
ad262355f6
Merge pull request #1360 from dataease/pr@1.5@refactor_panel-pdf
fix: 修复PDF导出没有背景的问题
2021-12-01 16:48:34 +08:00
fit2cloud-chenyw
0fbba3acf3
Merge pull request #1359 from dataease/pr@v1.5@refactor_去除时间控件外边框
refactor: 去除时间控件外边框
2021-12-01 16:48:07 +08:00
fit2cloud-chenyw
901d7a852d refactor: 去除时间控件外边框 2021-12-01 16:47:12 +08:00
wangjiahao
92bdf3717c Merge remote-tracking branch 'origin/v1.5' into refactor_panel-pdf 2021-12-01 16:46:32 +08:00
wangjiahao
9247bb6188 fix: 修复PDF导出没有背景的问题 2021-12-01 16:42:12 +08:00
王嘉豪
773d59889a
Merge pull request #1358 from dataease/v1.5
V1.5
2021-12-01 15:19:12 +08:00
王嘉豪
93d8e58994
Merge pull request #1357 from dataease/pr@v1.5@refactor_panel-pdf
fix: 画布出现滚动条时,拖入的组件会靠上的问题
2021-12-01 15:15:00 +08:00
wangjiahao
f75d00eda6 fix: 画布出现滚动条时,拖入的组件会靠上的问题 2021-12-01 15:14:24 +08:00
王嘉豪
c0fcd339be
Merge pull request #1356 from dataease/v1.5
V1.5
2021-12-01 14:49:54 +08:00
王嘉豪
c8a84337a9
Merge pull request #1355 from dataease/pr@v1.5@refactor_panel-pdf
refactor: 仪表板导出pdf优化,防止导出画面不全
2021-12-01 14:48:53 +08:00
wangjiahao
3ce6aaebfb refactor: 仪表板导出pdf优化,防止导出画面不全 2021-12-01 14:47:19 +08:00
taojinlong
6053d0565d Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-01 11:57:55 +08:00
taojinlong
90ab87c86b refactor: 国际化处理 2021-12-01 11:57:39 +08:00
taojinlong
cb9020b903 Merge branch 'v1.5' of github.com:dataease/dataease into v1.5 2021-12-01 11:56:57 +08:00
taojinlong
d0436c598b refactor: 国际化处理 2021-12-01 11:56:05 +08:00
王嘉豪
365ae546b0
Merge pull request #1354 from dataease/v1.5
V1.5
2021-12-01 11:53:38 +08:00
wangjiahao
0c97b7b9b3 fix: 修复主题滑块删除最后一下主题,滑块箭头指向不对问题 2021-12-01 11:52:31 +08:00
XiaJunjie2020
47203613d9
Merge pull request #1352 from dataease/pr@v1.5@refactor_error_tip
refactor(数据集): 优化数据集数据预览报错信息
2021-12-01 11:50:28 +08:00
junjie
cbc46be67c refactor(数据集): 优化数据集数据预览报错信息 2021-12-01 11:49:15 +08:00
XiaJunjie2020
cd485a89c3
Merge pull request #1350 from dataease/pr@dev@refactor_error_tip
refactor(数据集): 优化数据集数据预览报错信息
2021-12-01 11:46:51 +08:00
junjie
7f949fbc83 refactor(数据集): 优化数据集数据预览报错信息 2021-12-01 11:45:59 +08:00
fit2cloud-chenyw
49ab2d678f fix: 仪表板日期组件无法二次编辑 2021-12-01 11:33:43 +08:00
fit2cloud-chenyw
f86a9a589e
Merge pull request #1349 from dataease/pr@v1.5@fix_panel_date_component
fix: 仪表板日期组件无法二次编辑
2021-12-01 11:32:39 +08:00
fit2cloud-chenyw
06d5e913f7 fix: 仪表板日期组件无法二次编辑 2021-12-01 11:31:37 +08:00
王嘉豪
77b1991e36
Merge pull request #1348 from dataease/v1.5
V1.5
2021-12-01 11:21:03 +08:00
王嘉豪
d1c2eb1528
refactor: 仪表板视图刷新超时后给出提示,下次刷新可自动恢复
* refactor: 仪表板视图刷新超时后给出提示,下次刷新可自动恢复

* refactor: 仪表板视图刷新超时后给出提示,下次刷新可自动恢复
2021-12-01 11:19:53 +08:00
fit2cloud-chenyw
4046846a7e
Merge pull request #1345 from dataease/pr@v1.5@refactor_disable_report_task
refactor: 定时报告迭代至下版本
2021-12-01 10:50:29 +08:00
fit2cloud-chenyw
0a99b6a358 refactor: 定时报告迭代至下版本 2021-12-01 10:48:06 +08:00