Commit Graph

3566 Commits

Author SHA1 Message Date
XiaJunjie2020
41f8e875d8
Merge pull request #1388 from dataease/pr@dev@feat_union_ds
feat(数据集): 关联数据集
2021-12-03 17:38:32 +08:00
junjie
1cd7936505 feat(数据集): 关联数据集 2021-12-03 17:37:22 +08:00
王嘉豪
2a9fdea052
Merge pull request #1387 from dataease/pr@dev@fix_panel-pdf
fix: 修复仪表板pdf截图问题
2021-12-03 17:36:10 +08:00
wangjiahao
08d46d8827 fix: 修复仪表板pdf截图问题 2021-12-03 17:35:18 +08:00
junjie
298acdae9a feat(数据集): 关联数据集 2021-12-03 15:58:36 +08:00
XiaJunjie2020
7747d9ed55
Merge pull request #1380 from dataease/pr@dev@feat_union_ds
feat(数据集): 关联数据集
2021-12-02 18:35:42 +08:00
junjie
d8a0212a35 feat(数据集): 关联数据集 2021-12-02 18:33:49 +08:00
junjie
d6aa5740c0 feat(数据集): 关联数据集 2021-12-02 18:19:16 +08:00
XiaJunjie2020
2347ee7bc7
Merge pull request #1379 from dataease/pr@dev@feat_union_ds
feat(数据集): 关联数据集
2021-12-02 17:55:46 +08:00
junjie
a1909f59cd feat(数据集): 关联数据集 2021-12-02 17:54:56 +08:00
XiaJunjie2020
9dd4178566
Merge pull request #1378 from dataease/pr@dev@feat_union_ds
feat(数据集): 关联数据集
2021-12-02 17:05:55 +08:00
junjie
e3efc82fc5 feat(数据集): 关联数据集 2021-12-02 17:04:42 +08:00
王嘉豪
cfbc35fbc7
Merge pull request #1376 from dataease/pr@dev@refactor_panel-open
refactor: 开启移动端设置
2021-12-02 16:48:28 +08:00
XiaJunjie2020
56597ec08f
Merge pull request #1377 from dataease/pr@dev@feat_union_ds
feat(数据集): 关联数据集
2021-12-02 16:41:08 +08:00
junjie
4a8bfefac4 feat(数据集): 关联数据集 2021-12-02 16:40:14 +08:00
wangjiahao
601f9e4dcc refactor: 开启移动端设置 2021-12-02 16:37:11 +08:00
XiaJunjie2020
408a796e74
Merge pull request #1373 from dataease/pr@dev@feat_unon_ds
feat(数据集): 关联数据集
2021-12-02 15:00:11 +08:00
junjie
acb54573cb feat(数据集): 关联数据集 2021-12-02 14:58:42 +08:00
xuwei-fit2cloud
70cdd22f87 docs: 修改README 2021-12-02 10:15:19 +08:00
taojinlong
6c9b3882ba fix: 处理 excel 数据 2021-12-01 21:43:17 +08:00
taojinlong
3bc9e0561a Merge branch 'v1.5' of github.com:dataease/dataease into v1.5 2021-12-01 21:42:12 +08:00
taojinlong
897eb69a80 fix: 处理 excel 数据 2021-12-01 21:41:59 +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