Commit Graph

7204 Commits

Author SHA1 Message Date
dataeaseShu
0f563f4feb Merge branch 'dev' into pr@dev_dataset_source 2022-09-22 16:21:48 +08:00
dataeaseShu
f7f8f0ab1b fix: 数据源类型 布局 2022-09-22 16:21:07 +08:00
xuwei-fit2cloud
d78d7bc035
Merge pull request #3154 from dataease/pr@dev_dataset_source
Pr@dev dataset source
2022-09-22 15:10:06 +08:00
dataeaseShu
962c1b8be9 Merge branch 'dev' into pr@dev_dataset_source 2022-09-22 14:58:07 +08:00
dataeaseShu
d90a49716c fix: 插件国际化 表格记忆select 2022-09-22 14:57:38 +08:00
王嘉豪
6fe510c93d
Merge pull request #3153 from dataease/pr@dev@feat_view_margin_setting
feat(视图): echarts视图外边距设置
2022-09-22 14:44:21 +08:00
fit2cloud-chenyw
fcba8662b4
Merge pull request #3150 from dataease/pr@dev_dataset_source
Pr@dev dataset source
2022-09-22 14:40:45 +08:00
fit2cloud-chenyw
aa2cb5eb77 feat(视图): echarts视图外边距设置 2022-09-22 14:20:24 +08:00
xuwei-fit2cloud
161fc5a23d
Merge pull request #3151 from dataease/pr@dev@refactor_app-dock
refactor: 应用对接定时数据集立即同步
2022-09-22 12:59:43 +08:00
xuwei-fit2cloud
334c6e261a
Merge pull request #3152 from dataease/pr@dev@refactor_threshold_bg_color
refactor(视图): 阈值默认背景色调整
2022-09-22 12:59:10 +08:00
taojinlong
067e1facb2 feat: 区分数据库类型 2022-09-22 11:50:29 +08:00
junjun
8859f4c017 refactor(视图): 阈值默认背景色调整 2022-09-22 11:46:26 +08:00
wangjiahao
6671856890 refactor: 应用对接定时数据集立即同步 2022-09-22 11:26:31 +08:00
dataeaseShu
d97a127f05 Merge branch 'dev' into pr@dev_dataset_source 2022-09-22 11:26:09 +08:00
dataeaseShu
dd5ce34902 fix: 预览数据 滚动条问题修复 2022-09-22 11:25:31 +08:00
junjun
9aed15e28b Merge remote-tracking branch 'origin/dev' into dev 2022-09-22 10:04:48 +08:00
taojinlong
d3b369bb44
Merge pull request #3139 from dataease/pr@dev_dataset_source
Pr@dev dataset source
2022-09-22 09:53:46 +08:00
dataeaseShu
bfc6c323a7 Merge branch 'dev' into pr@dev_dataset_source 2022-09-22 09:50:43 +08:00
dataeaseShu
cf832dde75 fix: 删除注释 2022-09-22 09:48:14 +08:00
fit2cloud-chenyw
f342b8faf7 Merge pull request #3143 from dataease/pr@dev@style_wizard
style(首页): 替换二维码,修改欢迎文案
2022-09-22 08:55:58 +08:00
wangjiahao
fc27e5bf83 style(首页): 替换二维码,修改欢迎文案 2022-09-21 18:26:01 +08:00
dataeaseShu
af84c4d6c5 Merge branch 'dev' into pr@dev_dataset_source 2022-09-21 17:33:09 +08:00
dataeaseShu
0d4d49ae05 fix: 数据集 主题页面返回保持状态 保存数据集 添加loading 修复部分bug 2022-09-21 17:32:03 +08:00
junjun
f4dffbc163 Merge remote-tracking branch 'origin/dev' into dev 2022-09-21 17:18:40 +08:00
Junjun
1db2cf03e7
Merge pull request #3138 from dataease/pr@dev@feat_view_slider_style
feat(视图): 缩略图增加样式配置
2022-09-21 17:17:46 +08:00
fit2cloud-chenyw
f773a3109f feat(视图): 缩略图增加样式配置 2022-09-21 17:09:16 +08:00
junjun
6b1c88a741 Merge remote-tracking branch 'origin/dev' into dev 2022-09-21 16:22:11 +08:00
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