Commit Graph

7976 Commits

Author SHA1 Message Date
taojinlong
a9cca87c7f Merge branch 'dev' of github.com:dataease/dataease into dev 2022-11-07 10:43:15 +08:00
taojinlong
aa208e4e50 refactor: 升级版本号 2022-11-07 10:43:04 +08:00
xuwei-fit2cloud
3e4af323dd
Merge pull request #3651 from dataease/pr@dev_memory_component
fix: 内存泄露修复
2022-11-07 10:19:38 +08:00
dataeaseShu
5716c4ad1f fix: 内存泄露修复 2022-11-07 10:13:09 +08:00
wisonic-s
2f76a9aece
Merge pull request #3647 from dataease/pr@dev@fix_symbol_map
fix(视图): 符号地图锁定依赖解决符号无法展示
2022-11-04 17:19:19 +08:00
fit2cloud-chenyw
41b2d5e8a4
Merge pull request #3642 from dataease/pr@dev@fix_batch_operation
Merge branch 'dev' into pr@dev@fix_batch_operation
2022-11-04 17:18:13 +08:00
fit2cloud-chenyw
5ecd45caeb fix(视图): 符号地图锁定依赖解决符号无法展示 2022-11-04 17:10:05 +08:00
wisonic-s
bfcf491c0e Merge branch 'dev' into pr@dev@fix_batch_operation 2022-11-04 11:41:14 +08:00
wisonic-s
10dd44d3ce refactor(视图-批量操作): 优化批量操作逻辑
批量操作时将第一个添加的视图或最后一个视图的属性作为默认属性
https://www.tapd.cn/55578866/bugtrace/bugs/view/1155578866001019214
2022-11-04 11:38:49 +08:00
wisonic-s
957fc2896a fix(视图-水波图和指标): 修复批量操作BUG
修复水波图和指标批量修改标签无效的BUG
2022-11-04 11:34:04 +08:00
xuwei-fit2cloud
77fac8f684
Merge pull request #3635 from dataease/pr@dev@fix_user_import
feat(用户管理): 导入用户使用xlsx
2022-11-03 17:06:07 +08:00
fit2cloud-chenyw
8eff2f492c feat(用户管理): 导入用户使用xlsx 2022-11-03 17:04:07 +08:00
xuwei-fit2cloud
c937bbd9ed
Merge pull request #3633 from dataease/pr@dev@refactor_template-market-sort
refactor(模板市场): 增加模板市场分类排序
2022-11-03 16:53:00 +08:00
wangjiahao
df0b4b2a6e refactor(模板市场): 增加模板市场分类排序 2022-11-03 16:50:22 +08:00
王嘉豪
cb58851f65
Merge pull request #3629 from dataease/pr@dev@fix_map_mapping_search
fix: 修复eslint导致的地图映射搜索不可用
2022-11-03 10:50:41 +08:00
fit2cloud-chenyw
b4f7453df8 fix: 修复eslint导致的地图映射搜索不可用 2022-11-03 09:53:25 +08:00
王嘉豪
2234a82f0f
Merge pull request #3627 from dataease/pr@dev@refactor_app-replace
fix(应用): 修复数据集字段未替换问题
2022-11-03 08:58:32 +08:00
wangjiahao
e471784e4e fix(应用): 修复数据集字段未替换问题 2022-11-03 08:57:13 +08:00
王嘉豪
3b45e35025
Merge pull request #3625 from dataease/pr@dev@refactor_app-sort
fix(应用): 解决无法创建应用分类问题
2022-11-03 08:09:29 +08:00
wangjiahao
5b82da6e8b fix(应用): 解决无法创建应用分类问题 2022-11-03 08:07:28 +08:00
fit2cloud-chenyw
9f40cbd30f
Merge pull request #3623 from dataease/pr@dev@refactor_app-update
refactor(应用): 优化默认应用模板
2022-11-02 21:50:50 +08:00
wangjiahao
75b6e9d26f refactor(应用): 优化默认应用模板 2022-11-02 21:48:45 +08:00
王嘉豪
3c4434af40
Merge pull request #3621 from dataease/pr@dev@style_tree_select
style(仪表板): 树过滤器样式分离
2022-11-02 21:46:27 +08:00
fit2cloud-chenyw
74af48f68c style(仪表板): 树过滤器样式分离 2022-11-02 21:12:31 +08:00
fit2cloud-chenyw
d75b4de2be
Merge pull request #3618 from dataease/pr@dev@fix_app-new
refactor(应用): 增加默认JMS应用模板
2022-11-02 18:55:19 +08:00
wangjiahao
4fdccff8fe refactor(应用): 增加默认JMS应用模板 2022-11-02 18:53:21 +08:00
xuwei-fit2cloud
aa2f13c1fa
Merge pull request #3616 from dataease/pr@dev@dataset
Pr@dev@dataset
2022-11-02 17:37:46 +08:00
xuwei-fit2cloud
561168aa21
Merge pull request #3615 from dataease/pr@dev@fix_app-save
fix(应用): 应用保存增加判断,防止保存为空
2022-11-02 17:34:29 +08:00
Junjun
bc60514d3a
Merge pull request #3614 from dataease/pr@dev@refactor_flyway
refactor: 修改Mysql相关字符集排序
2022-11-02 17:30:46 +08:00
wangjiahao
cbca61f0b5 fix(应用): 应用保存增加判断,防止保存为空 2022-11-02 17:30:03 +08:00
taojinlong
51e8d309ff Merge branch 'dev' of github.com:dataease/dataease into dev 2022-11-02 17:21:14 +08:00
taojinlong
ffba26de67 fix(数据源): 解析API数据源出错 2022-11-02 17:21:05 +08:00
wangjiahao
53c43967e3 refactor: 修改Mysql相关字符集排序 2022-11-02 17:17:33 +08:00
Junjun
1f409baab4
Merge pull request #3613 from dataease/pr@dev@fix_mobile
fix(移动端): 修复移动端放大不显示问题
2022-11-02 16:42:59 +08:00
王嘉豪
77de07b9d6
Merge pull request #3612 from dataease/pr@dev@fix_mobile_share_error
fix(移动端): 没有角色的用户无法查看分享仪表板
2022-11-02 16:41:02 +08:00
fit2cloud-chenyw
fce9905c23 fix(移动端): 没有角色的用户无法查看分享仪表板 2022-11-02 16:29:02 +08:00
wangjiahao
af37641353 fix(移动端): 修复移动端放大不显示问题 2022-11-02 16:26:58 +08:00
Junjun
2a0087c0db
Merge pull request #3610 from dataease/pr@dev@fix_tab-toolbar
fix(仪表板): 修复组件工具栏同时悬浮在不同Tab页的问题
2022-11-02 16:04:57 +08:00
王嘉豪
8a6eb0ad1a
Merge pull request #3611 from dataease/pr@dev_eslint_auto_fix
Pr@dev eslint auto fix
2022-11-02 16:03:44 +08:00
dataeaseShu
66f7608992 Merge branch 'dev' into pr@dev_eslint_auto_fix 2022-11-02 15:48:16 +08:00
wangjiahao
3c52421b10 fix(仪表板): 修复组件工具栏同时悬浮在不同Tab页的问题 2022-11-02 15:46:02 +08:00
dataeaseShu
c25060ff2b fix: 数据集更新信息 加权限 数据源bug修复 2022-11-02 15:35:23 +08:00
xuwei-fit2cloud
7f4beede72
Merge pull request #3609 from dataease/pr@dev@fix_app-import
refactor(应用): 优化应用的静态文件存储方式,静态文件直接存放在服务器
2022-11-02 15:31:24 +08:00
wangjiahao
08b90af58c refactor(应用): 优化应用的静态文件存储方式,静态文件直接存放在服务器 2022-11-02 15:27:22 +08:00
王嘉豪
4a165ae0d4
Merge pull request #3608 from dataease/pr@dev_eslint_auto_fix
Pr@dev eslint auto fix
2022-11-02 14:59:39 +08:00
dataeaseShu
6e95a05ccd Merge branch 'dev' into pr@dev_eslint_auto_fix 2022-11-02 14:56:59 +08:00
dataeaseShu
fbfbdae84f fix: 视图显示延迟bug修复 2022-11-02 14:56:13 +08:00
Junjun
061df1daa6
Merge pull request #3606 from dataease/pr@dev_eslint_auto_fix
Pr@dev eslint auto fix
2022-11-02 14:36:09 +08:00
dataeaseShu
b57be80aad Merge branch 'dev' into pr@dev_eslint_auto_fix 2022-11-02 14:29:39 +08:00
dataeaseShu
215ba53ade fix: 视图title相关bug修复 2022-11-02 14:28:53 +08:00