wangjiahao
|
01b4924707
|
refactor: 移动端仪表板视图明细优化,手机端明细展开改为全屏模式
|
2021-12-16 11:10:50 +08:00 |
|
wangjiahao
|
5e4281c0f3
|
Merge remote-tracking branch 'origin/v1.5' into fix_panel-style
|
2021-12-16 10:59:08 +08:00 |
|
wangjiahao
|
40d1df6074
|
fix: 移动端布局重新打开编辑可能出现错位问题
|
2021-12-15 17:26:23 +08:00 |
|
王嘉豪
|
4bff55b1e4
|
Merge pull request #1444 from dataease/pr@dev@fix_panel-style
refactor: 调整仪表板其他组件图标大小
|
2021-12-15 13:47:55 +08:00 |
|
wangjiahao
|
1eedfb7ad4
|
refactor: 调整仪表板其他组件图标大小
|
2021-12-15 13:47:11 +08:00 |
|
王嘉豪
|
95faaf1dcd
|
Merge pull request #1443 from dataease/pr@dev@fix_panel-style
fix: 设置联动信息是,目标视图选项存在uuid问题
|
2021-12-15 11:44:51 +08:00 |
|
wangjiahao
|
fe35463a4a
|
fix: 设置联动信息是,目标视图选项存在uuid问题
|
2021-12-15 11:34:32 +08:00 |
|
王嘉豪
|
1559cf941d
|
Merge pull request #1442 from dataease/pr@dev@fix_panel-style
fix: 仪表板Tab组件预览模式图层不明确问题
|
2021-12-15 11:28:26 +08:00 |
|
wangjiahao
|
bbb082371d
|
fix: 仪表板Tab组件预览模式图层不明确问题
|
2021-12-15 11:26:50 +08:00 |
|
王嘉豪
|
5b3d4f3cae
|
Merge pull request #1439 from dataease/pr@dev@fix_panel-line
fix: 修复仪表板内组件移动时没有对齐标线问题
|
2021-12-14 17:53:54 +08:00 |
|
wangjiahao
|
76cce15c53
|
fix: 修复仪表板内组件移动时没有对齐标线问题
|
2021-12-14 17:52:28 +08:00 |
|
taojinlong
|
2b18d64c7c
|
Merge branch 'dev' of github.com:dataease/dataease into dev
|
2021-12-14 16:27:50 +08:00 |
|
taojinlong
|
4a7d8efe7c
|
feat: 行权限支持"与/或"
|
2021-12-14 16:27:32 +08:00 |
|
junjie
|
81a2b4753e
|
feat(视图): 过滤器支持and、or逻辑
|
2021-12-14 15:26:33 +08:00 |
|
王嘉豪
|
60df023918
|
Merge pull request #1438 from dataease/pr@dev@feat_panel-link-jump
feat: 仪表板处于公共链接模式,跳转的目标仪表板也以公共链接跳转,同时支持传参数
|
2021-12-14 15:23:06 +08:00 |
|
wangjiahao
|
2ea9678dd8
|
feat: 仪表板处于公共链接模式,跳转的目标仪表板也以公共链接跳转,同时支持传参数
|
2021-12-14 15:22:03 +08:00 |
|
taojinlong
|
4683181a6b
|
refactor: 回退
|
2021-12-14 15:20:44 +08:00 |
|
taojinlong
|
fc5bbd3689
|
Merge branch 'dev' of github.com:dataease/dataease into dev
|
2021-12-14 15:07:06 +08:00 |
|
taojinlong
|
82a5e142d2
|
fxi: 定时同步 db2
|
2021-12-14 15:06:47 +08:00 |
|
王嘉豪
|
791a76ca3c
|
Merge pull request #1437 from dataease/pr@dev@fix_panel-filter
feat: 仪表板tab组件内视图,支持放大和编辑
|
2021-12-14 11:45:24 +08:00 |
|
wangjiahao
|
beb295f38f
|
feat: 仪表板tab组件内视图,支持放大和编辑
|
2021-12-14 11:43:41 +08:00 |
|
XiaJunjie2020
|
a079a97aac
|
Merge pull request #1436 from dataease/pr@dev@permission
feat(视图): 行权限
|
2021-12-14 11:37:36 +08:00 |
|
junjie
|
d11021934b
|
feat(视图): 行权限
|
2021-12-14 11:35:35 +08:00 |
|
junjie
|
f4d81ef552
|
feat: 行权限构建
|
2021-12-14 11:10:04 +08:00 |
|
junjie
|
9505e3101b
|
feat: 行权限构建
|
2021-12-14 11:09:38 +08:00 |
|
XiaJunjie2020
|
1d61309804
|
Merge pull request #1435 from dataease/pr@dev@feat_logic
feat(视图): 过滤器支持and、or逻辑
|
2021-12-14 10:14:51 +08:00 |
|
junjie
|
955d72cb75
|
feat(视图): 过滤器支持and、or逻辑
|
2021-12-14 10:14:02 +08:00 |
|
junjie
|
def246cc54
|
fix: rollback
|
2021-12-13 17:50:25 +08:00 |
|
XiaJunjie2020
|
92fa47d623
|
Merge pull request #1434 from dataease/pr@dev@feat_filter
feat(视图): 过滤器支持and、or逻辑
|
2021-12-13 17:15:18 +08:00 |
|
junjie
|
6cb70f33a5
|
feat(视图): 过滤器支持and、or逻辑
|
2021-12-13 16:38:22 +08:00 |
|
taojinlong
|
96b4d2cf41
|
fxi: sql 拼接
|
2021-12-10 23:39:26 +08:00 |
|
taojinlong
|
87ea43b09d
|
fxi: sql 拼接
|
2021-12-10 23:37:01 +08:00 |
|
taojinlong
|
1f94e7cbda
|
Merge pull request #1433 from dataease/pr@dev@variable
Merge branch 'dev' into pr@dev@variable
|
2021-12-10 23:23:58 +08:00 |
|
taojinlong
|
14536b648a
|
Merge branch 'dev' into pr@dev@variable
|
2021-12-10 23:21:01 +08:00 |
|
taojinlong
|
1e60188abd
|
feat(数据源): 数据集行权限
|
2021-12-10 23:20:17 +08:00 |
|
王嘉豪
|
9d7c2859db
|
Merge pull request #1431 from dataease/pr@devfix_panel-filter
Pr@devfix panel filter
|
2021-12-10 17:02:43 +08:00 |
|
wangjiahao
|
2f109a94c9
|
Merge remote-tracking branch 'origin/dev' into pr@devfix_panel-filter
|
2021-12-10 17:02:05 +08:00 |
|
wangjiahao
|
31b76c1574
|
feat: 仪表板选项卡组件内视图支持放大编辑
|
2021-12-10 17:00:19 +08:00 |
|
junjie
|
139bd804ad
|
feat(视图): 同比环比
|
2021-12-10 15:58:01 +08:00 |
|
XiaJunjie2020
|
37cb956213
|
Merge pull request #1429 from dataease/pr@dev@feat_compare
feat(视图): 同比环比
|
2021-12-10 11:38:24 +08:00 |
|
junjie
|
ea3133dd96
|
feat(视图): 同比环比
|
2021-12-10 11:37:26 +08:00 |
|
XiaJunjie2020
|
675b58093c
|
Merge pull request #1428 from dataease/pr@dev@feat_union_ds
feat(数据集): 关联数据集
|
2021-12-10 11:25:42 +08:00 |
|
junjie
|
96fa9cc53e
|
feat(数据集): 关联数据集
|
2021-12-10 11:23:07 +08:00 |
|
XiaJunjie2020
|
e8fe0f22ef
|
Merge pull request #1427 from dataease/pr@dev@refactor_chart
refactor(视图): 指标结果优化
|
2021-12-10 11:02:35 +08:00 |
|
junjie
|
deb5456d91
|
refactor(视图): 指标结果优化
|
2021-12-10 11:01:26 +08:00 |
|
XiaJunjie2020
|
94ad20200e
|
Merge pull request #1426 from dataease/pr@dev@feat_compare
feat(视图): 同比环比
|
2021-12-10 10:44:41 +08:00 |
|
junjie
|
bfa247cbc3
|
feat(视图): 同比环比
|
2021-12-10 10:43:34 +08:00 |
|
fit2cloud-chenyw
|
562169320f
|
Merge pull request #1425 from dataease/pr@dev@revert_image
revert: 镜像回退
|
2021-12-09 21:27:37 +08:00 |
|
fit2cloud-chenyw
|
44f721d3ae
|
revert: 镜像回退
|
2021-12-09 21:25:13 +08:00 |
|
fit2cloud-chenyw
|
7353b40ae7
|
Merge pull request #1424 from dataease/pr@dev@fix_image_sh
feat: 修改镜像运行脚本
|
2021-12-09 19:00:08 +08:00 |
|