Commit Graph

7377 Commits

Author SHA1 Message Date
fit2cloud-chenyw
b4793c7ab8
Merge pull request #3137 from dataease/pr@dev@refactor_title-change
refactor: 优化标题修改,防止修改标题时切换视图出现修改标题与视图不对应情况
2022-09-21 15:52:39 +08:00
wangjiahao
19128021f9 refactor: 优化标题修改,防止修改标题时切换视图出现修改标题与视图不对应情况 2022-09-21 15:44:53 +08:00
junjun
bf7036c44b Merge remote-tracking branch 'origin/dev' into dev 2022-09-21 14:55:22 +08:00
Junjun
1fbd393605
Merge pull request #3135 from dataease/pr@dev@perf_user_assist
perf(系统管理-用户管理): 用户辅助信息sql
2022-09-21 14:52:30 +08:00
王嘉豪
221cc0c3e7
Merge pull request #3134 from dataease/pr@dev@feat_user_assist
feat(系统管理-用户管理): 增加辅助信息包含第三方平台账号
2022-09-21 14:49:24 +08:00
Junjun
8462368a2c
Merge pull request #3133 from dataease/pr@dev_dataset_source
Pr@dev dataset source
2022-09-21 14:46:20 +08:00
fit2cloud-chenyw
e568ef88ed
Merge pull request #3136 from dataease/pr@dev@feat_threshold_between
feat(视图): 阈值支持介于
2022-09-21 14:35:25 +08:00
junjun
f97868bcb9 Merge remote-tracking branch 'origin/dev' into dev 2022-09-21 14:34:49 +08:00
fit2cloud-chenyw
6360b82430
Merge branch 'dev' into pr@dev@feat_user_assist 2022-09-21 14:28:06 +08:00
fit2cloud-chenyw
218fc8f879
Merge pull request #3132 from dataease/pr@dev@refactor_user-add
refactor: 新建用户支持不设置用户角色
2022-09-21 14:24:25 +08:00
junjun
c6c6d9accf feat(视图): 阈值支持介于 2022-09-21 14:12:09 +08:00
fit2cloud-chenyw
6cd176ab66 perf(系统管理-用户管理): 用户辅助信息sql 2022-09-21 14:06:27 +08:00
fit2cloud-chenyw
bf5bf82a30 feat(系统管理-用户管理): 增加辅助信息包含第三方平台账号 2022-09-21 14:01:02 +08:00
dataeaseShu
50826c672d Merge branch 'dev' into pr@dev_dataset_source 2022-09-21 11:57:33 +08:00
dataeaseShu
21a953eafb fix: 数据源页面刷新路由参数持久化 数据集保存跳转 bug修复 2022-09-21 11:55:39 +08:00
dataeaseShu
30b7c7452a
Merge pull request #3131 from dataease/pr@dev@feat_datasource_info
feat(数据源): 数据源详情
2022-09-21 10:55:58 +08:00
wangjiahao
cfd30ffa87 refactor: 新建用户支持不设置用户角色 2022-09-21 10:55:46 +08:00
junjun
ca92699340 feat(数据源): 数据源详情 2022-09-21 10:47:46 +08:00
Junjun
4d7578bfc2
Merge pull request #3125 from dataease/pr@dev@ds
fix: 数据源详情,数据集预览
2022-09-20 17:55:26 +08:00
taojinlong
d9d5c1cd08 refactor: 格式化 2022-09-20 17:41:45 +08:00
taojinlong
d522122fb2 fix: 数据源详情,数据集预览 2022-09-20 17:13:21 +08:00
xuwei-fit2cloud
44206c07ca
Merge pull request #3117 from dataease/pr@dev@feat_login_limit
feat(系统管理-用户管理): 登录限制以及解锁用户
2022-09-20 17:04:10 +08:00
fit2cloud-chenyw
3f7989894f
fix(登录): 国际化错误 2022-09-20 17:00:35 +08:00
fit2cloud-chenyw
32ad6c7613
Merge branch 'dev' into pr@dev@feat_login_limit 2022-09-20 16:49:07 +08:00
xuwei-fit2cloud
18f03ab7c6
Merge pull request #3124 from dataease/pr@dev@perf_view_bg_color
style(视图): 下钻区域以及地图缩放文字跟随视图背景改变
2022-09-20 16:28:28 +08:00
xuwei-fit2cloud
10c2e975b5
Merge pull request #3123 from dataease/pr@dev@feat_templatemarket-auth
feat: 模板市场支持权限管理和系统参数叠加权限控制,支持为不同用户开放或关闭“模板市场”菜单
2022-09-20 16:27:12 +08:00
fit2cloud-chenyw
7eac3fa0a6 style(视图): 下钻区域以及地图缩放文字跟随视图背景改变 2022-09-20 16:24:50 +08:00
wangjiahao
a29a232aa8 feat: 模板市场支持权限管理和系统参数叠加权限控制,支持为不同用户开放或关闭“模板市场”菜单 2022-09-20 16:19:33 +08:00
dataeaseShu
b19a20f2e7 Merge branch 'dev' into pr@dev_dataset_source 2022-09-20 16:15:50 +08:00
dataeaseShu
9e5b36dc46 Merge branch 'dev' into pr@dev_dataset_source 2022-09-20 16:15:09 +08:00
xuwei-fit2cloud
b5f70711e5
Merge pull request #3120 from dataease/pr@dev@perf_filter_placeholder
perf(仪表板-过滤器): 过滤器提示文案
2022-09-20 16:03:38 +08:00
xuwei-fit2cloud
a03e119d00
Merge pull request #3121 from dataease/pr@dev@style_css_change
style(视图): 样式调整
2022-09-20 16:01:32 +08:00
junjun
558d328c52 style(视图): 样式调整 2022-09-20 15:59:15 +08:00
dataeaseShu
aba68be35b feat: 数据参考 excel 同名校验 国际化 2022-09-20 15:56:02 +08:00
fit2cloud-chenyw
70f423a6fc perf(仪表板-过滤器): 过滤器提示文案 2022-09-20 15:11:53 +08:00
fit2cloud-chenyw
dd7c3d12ac
Merge branch 'dev' into pr@dev@feat_login_limit 2022-09-20 14:45:37 +08:00
Junjun
e9e9d27456
Merge pull request #3118 from dataease/pr@dev@refactor_panel-copy-style
refactor(仪表板): 复用视图支持适配当前仪表板样式
2022-09-20 14:44:10 +08:00
wangjiahao
0b3d3257ea refactor(仪表板): 复用视图支持适配当前仪表板样式 2022-09-20 14:29:21 +08:00
fit2cloud-chenyw
f2c238798d feat(系统管理-用户管理): 登录限制以及解锁用户 2022-09-20 14:26:15 +08:00
xuwei-fit2cloud
f38b0023ca
Merge pull request #3114 from dataease/refactor@dev@refactor_panel-details
refactor(仪表板): 仪表板详情弹框显示用户别名
2022-09-20 13:42:44 +08:00
dataeaseShu
59a605c0c9
feat: 数据集 数据源优化
* feat: 数据集 数据源优化

* feat: 国际化

* feat: 格式化

* feat: 国际化修正 合并代码
2022-09-20 11:53:57 +08:00
junjun
44720e4e33 feat(视图): 堆叠项支持自定义排序 2022-09-20 11:31:44 +08:00
Junjun
daed174fda
Merge pull request #3116 from dataease/pr@dev@refactor_panel-empty-tips
refactor(仪表板): 优化仪表板为空的提示显示
2022-09-20 11:29:50 +08:00
wangjiahao
4602c25fef refactor(仪表板): 优化仪表板为空的提示显示 2022-09-20 11:26:49 +08:00
dataeaseShu
80d7f2927a feat: 国际化修正 合并代码 2022-09-20 11:19:28 +08:00
wangjiahao
53dbd841a6 refactor(仪表板): 仪表板详情弹框显示用户别名 2022-09-20 11:13:08 +08:00
dataeaseShu
f88d771dec Merge branch 'dev' into pr@dev_dataset_source 2022-09-20 10:45:16 +08:00
xuwei-fit2cloud
f4e1a28b40
Merge pull request #3110 from dataease/pr@dev@csv
feat: 支持 csv 文件
2022-09-20 10:00:29 +08:00
xuwei-fit2cloud
4906dcceef
Merge pull request #3111 from dataease/pr@dev@feat_app-template
feat: 支持应用市场,支持应用导入导出
2022-09-20 09:59:20 +08:00
wangjiahao
2217d46a8d refactor(仪表板): 仪表板详情弹框显示用户别名 2022-09-19 18:47:15 +08:00