Commit Graph

4326 Commits

Author SHA1 Message Date
fit2cloud-chenyw
f6bfccdb24 fix: 新建资源缓存一致性问题 2022-02-14 11:56:58 +08:00
fit2cloud-chenyw
7ff7025f0c
Merge pull request #1756 from dataease/pr@dev@feat_panel_plugin_view
feat: 仪表板集成插件视图
2022-02-14 10:09:27 +08:00
fit2cloud-chenyw
0aa2a69ff1 feat: 仪表板集成插件视图 2022-02-14 10:08:28 +08:00
fit2cloud-chenyw
a2d63ace6f
Merge pull request #1755 from dataease/pr@dev@fix_mobile_layout
fix: 移动端详情页面布局
2022-02-14 10:06:49 +08:00
fit2cloud-chenyw
511fd05a0c fix: 移动端详情页面布局 2022-02-14 10:05:46 +08:00
wangjiahao
ecf1be4486 Merge remote-tracking branch 'origin/dev' into dev 2022-02-11 17:12:54 +08:00
junjun
8f39fbe3f5 feat: S2 pivot 2022-02-11 16:53:57 +08:00
wangjiahao
9eee9ed0f2 refactor: 文案修改 2022-02-11 16:47:01 +08:00
junjun
2c1f0533f2 feat: S2 pivot 2022-02-11 15:23:32 +08:00
fit2cloud-chenyw
205554ab83
Merge pull request #1752 from dataease/pr@dev@refactor_format_code
refactor: 格式化代码
2022-02-11 14:23:45 +08:00
fit2cloud-chenyw
756b056d99 refactor: 格式化代码 2022-02-11 14:22:17 +08:00
wangjiahao
fcb74448d1 Merge remote-tracking branch 'origin/dev' into dev 2022-02-11 10:14:18 +08:00
wangjiahao
7a1e79e314 feat: 权限管理按资源授权方式支持行列权限设置 2022-02-11 10:14:01 +08:00
fit2cloud-chenyw
7631b06831
Merge pull request #1751 from dataease/pr@dev@refactor_version
refactor: 升级版本号1.8.0
2022-02-10 19:00:35 +08:00
fit2cloud-chenyw
302fc5db74 refactor: 升级版本号1.8.0 2022-02-10 18:58:41 +08:00
fit2cloud-chenyw
a3052e1b23
Merge pull request #1750 from dataease/pr@dev@feat_view_plugin
feat: 新增气泡地图插件兼容
2022-02-10 18:30:09 +08:00
fit2cloud-chenyw
60fa4e1cd4
Merge branch 'dev' into pr@dev@feat_view_plugin 2022-02-10 18:29:04 +08:00
fit2cloud-chenyw
417d869d46 feat: 新增气泡地图插件兼容 2022-02-10 18:17:41 +08:00
Junjun
de83d6e78e
Merge pull request #1749 from dataease/pr@dev@refactor_ds_preview
refactor: 数据集预览优化
2022-02-10 18:06:32 +08:00
junjun
107635933e refactor: 数据集预览优化 2022-02-10 18:04:38 +08:00
wangjiahao
0d73961d86 Merge remote-tracking branch 'origin/dev' into dev 2022-02-10 17:11:16 +08:00
wangjiahao
330bd29232 fix: 修复新tab页预览无法打开的问题 2022-02-10 17:10:58 +08:00
junjun
05bd33b246 feat: S2 pivot 2022-02-10 14:19:59 +08:00
Junjun
8d973d9b98
Merge pull request #1748 from dataease/pr@dev@feat_S2_pivot
feat: S2 pivot
2022-02-10 10:23:40 +08:00
junjun
51412b6641 feat: S2 pivot 2022-02-10 10:22:45 +08:00
wangjiahao
757f9a5c21 Merge remote-tracking branch 'origin/dev' into dev 2022-02-09 18:02:10 +08:00
wangjiahao
064ca3b8c3 feat: 权限管理支持按照资源进行授权 2022-02-09 18:01:48 +08:00
Junjie
c178c67447
Merge pull request #1747 from dataease/pr@dev@fix_map_permission
fix: 修复地图范围不受权限控制的问题
2022-02-09 16:51:41 +08:00
junjie
69b1882085 fix: 修复地图范围不受权限控制的问题 2022-02-09 16:35:29 +08:00
Junjie
6b3d5832d2
Merge pull request #1743 from dataease/pr@dev@feat_S2_pivot
feat: S2 pivot
2022-02-08 14:29:11 +08:00
junjie
ec45a82244 feat: S2 pivot 2022-02-08 14:27:40 +08:00
fit2cloud-chenyw
7c89e4a9b8
Merge pull request #1742 from dataease/pr@dev@refactor_mobile_panel_contaner
refactor: 移动端仪表板详情外层布局
2022-02-08 14:04:33 +08:00
fit2cloud-chenyw
4d3324de52 refactor: 移动端仪表板详情外层布局 2022-02-08 14:03:35 +08:00
Junjie
86cdf5ad1b
Merge pull request #1741 from dataease/pr@dev@feat_S2_pivot
feat: S2 pivot
2022-02-08 13:57:44 +08:00
junjie
590fe30c16 feat: S2 pivot 2022-02-08 13:56:48 +08:00
junjie
95641feef7 feat: S2 pivot 2022-02-08 13:50:43 +08:00
fit2cloud-chenyw
253e48107a
Merge pull request #1739 from dataease/pr@dev@refactor_api_auth_admin
fix: api权限单独处理admin
2022-02-08 11:37:08 +08:00
fit2cloud-chenyw
81fe530fd9 fix: api权限单独处理admin 2022-02-08 11:36:12 +08:00
fit2cloud-chenyw
a846a8fe74 fix: 日期过滤默认值兼容老版本 2022-02-08 10:58:40 +08:00
junjie
9fc6cedca3 feat: S2 Event 2022-02-07 13:13:50 +08:00
junjie
de00628517 feat: S2 Event 2022-02-06 18:21:08 +08:00
fit2cloud-chenyw
fc1720c518
Merge pull request #1729 from dataease/pr@dev@fix_ziputil
fix: 解压zip未判断子目录
2022-02-05 23:51:19 +08:00
fit2cloud-chenyw
ec7c03a9ee fix: 解压zip未判断子目录 2022-02-05 23:49:52 +08:00
fit2cloud-chenyw
c370079b02 fix: 条件组件兼容老版本 2022-02-05 22:59:34 +08:00
fit2cloud-chenyw
2499f1c354 fix: 数字范围默认值导致仪表板空白 2022-02-05 22:32:59 +08:00
taojinlong
6b4200cf09 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-02-05 20:42:15 +08:00
taojinlong
f73e0f19e5 fix: mongo 过滤 2022-02-05 20:41:58 +08:00
Junjie
c5bf27e02b
Merge pull request #1726 from dataease/pr@dev@feat_s2_event
feat: S2 Event
2022-02-05 13:03:23 +08:00
junjie
f4fb642c17 feat: S2 Event 2022-02-05 13:02:30 +08:00
junjie
4be52b9908 feat: S2 Event 2022-02-05 12:47:34 +08:00