Commit Graph

3544 Commits

Author SHA1 Message Date
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
王嘉豪
b83c308325
Merge pull request #1409 from dataease/pr@dev@feat_panel-mobile-layout
feat: 仪表板支持移动端布局展示
2021-12-07 17:35:32 +08:00
wangjiahao
5998a6c286 feat: 仪表板支持移动端布局展示 2021-12-07 17:32:02 +08:00
taojinlong
d0f24db4b9
Merge pull request #1408 from dataease/pr@dev@db2
Merge branch 'dev' into pr@dev@db2
2021-12-07 17:12:03 +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
XiaJunjie2020
0a5a93fe1c
Merge pull request #1407 from dataease/pr@dev@refactor_ds_sql
refactor: 数据关联优化
2021-12-07 16:24:09 +08:00
junjie
b4c453b4b5 refactor: 数据关联优化 2021-12-07 16:23:20 +08:00
fit2cloudrd
51fb52a066
Update README.md 2021-12-06 17:37:03 +08:00
fit2cloudrd
514ef4008b
Create LICENSE 2021-12-06 17:28:35 +08:00
taojinlong
c51a41da34 fix: sql 拼接错误 2021-12-06 16:59:54 +08:00
王嘉豪
0d32b1d7b7
Merge pull request #1397 from dataease/pr@dev@fix_panel-edit-layout
fix: 修复编辑仪表板时,初始化和编辑视图返回组件位置可能变化的问题
2021-12-06 15:38:32 +08:00
wangjiahao
58705247ab fix: 修复编辑仪表板时,初始化和编辑视图返回组件位置可能变化的问题 2021-12-06 15:37:04 +08:00
XiaJunjie2020
b21cb8e736
Merge pull request #1396 from dataease/pr@dev@refactor_chart_icon
refactor: 视图优化
2021-12-06 14:42:19 +08:00
junjie
4f10dafec4 refactor: 视图优化 2021-12-06 14:41:12 +08:00
wangjiahao
e95fd0aeee Merge remote-tracking branch 'origin/dev' into dev 2021-12-06 11:54:51 +08:00
wangjiahao
e9404e6d1f fix: 修复对树形结构操作时,可能有其他节点展开的问题 2021-12-06 11:54:34 +08:00
XiaJunjie2020
7a43574326
Merge pull request #1394 from dataease/pr@dev@refactor_calc_field
refactor: 计算字段无需展示原始类型
2021-12-06 10:53:43 +08:00
junjie
297b26ca29 refactor: 计算字段无需展示原始类型 2021-12-06 10:52:57 +08:00
XiaJunjie2020
a6ca1a54f4
Merge pull request #1393 from dataease/pr@dev@fix_rollback
fix: rollback
2021-12-06 10:00:13 +08:00
junjie
5d83ffe0cf fix: rollback 2021-12-06 09:59:00 +08:00
fit2cloud-chenyw
c5e4dfc465
Merge pull request #1389 from dataease/pr@dev@feat_mobile_api
feat: 新增移动端接口
2021-12-03 18:24:34 +08:00
fit2cloud-chenyw
75cd6ec371 feat: 新增移动端接口 2021-12-03 18:23:28 +08:00
wangjiahao
fa5e0d9e19 Merge remote-tracking branch 'origin/dev' into dev 2021-12-03 17:40:52 +08:00
wangjiahao
2ab11e5007 fix: 修复仪表板pdf截图问题 2021-12-03 17:39:24 +08:00
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