Commit Graph

7311 Commits

Author SHA1 Message Date
taojinlong
5f09346929 fix(API数据源): 请求 form-data 失败 2022-09-27 17:25:04 +08:00
xuwei-fit2cloud
2532483a85
Merge pull request #3208 from dataease/pr@dev@perf_view_margin
perf(视图): 删除echarts分布式视图以及漏斗图外边距设置
2022-09-27 17:15:30 +08:00
xuwei-fit2cloud
c6cdde70bb
Merge pull request #3211 from dataease/pr@dev@fix_ligin_limit_validate
fix(登录限制): 限制登录次数填写保存后再次编辑出现验证逻辑错误
2022-09-27 17:14:33 +08:00
fit2cloud-chenyw
31dc2e48e8 fix(登录限制): 限制登录次数填写保存后再次编辑出现验证逻辑错误 2022-09-27 17:12:04 +08:00
fit2cloud-chenyw
ca479a4a6f perf(视图): 删除echarts分布式视图以及漏斗图外边距设置 2022-09-27 16:43:33 +08:00
taojinlong
f7fdf65062
Merge pull request #3204 from ren-jq101/dev
fix(sec): upgrade pagehelper to 5.3.1
2022-09-27 15:58:59 +08:00
xuwei-fit2cloud
5969ded4a9
Merge pull request #3202 from dataease/pr@dev@fix_template-manage
fix(模板管理): 修复删除模板分类列表未刷新问题
2022-09-27 15:45:34 +08:00
ren_jq
362c5736df upgrade pagehelper to 5.3.1 2022-09-27 15:39:28 +08:00
王嘉豪
285cb13233
Merge pull request #3203 from dataease/pr@dev@fix_view_margin
fix(视图): echarts指标类型以及空间类型视图删除外边距设置
2022-09-27 15:20:33 +08:00
fit2cloud-chenyw
3ef3216530 fix(视图): echarts指标类型以及空间类型视图删除外边距设置 2022-09-27 15:18:22 +08:00
wangjiahao
87306c41be fix(模板管理): 修复删除模板分类列表未刷新问题 2022-09-27 15:12:22 +08:00
xuwei-fit2cloud
a51c426035
Merge pull request #3200 from dataease/pr@dev@mysql-function
refactor: 修改数据库获取子级和父级函数,防止因垃圾数据出现环路导致循环情况
2022-09-27 15:01:23 +08:00
xuwei-fit2cloud
197596f3a7
Merge pull request #3201 from dataease/pr@dev@fix_echarts_margin
fix(视图): echarts外边距设置
2022-09-27 14:53:50 +08:00
fit2cloud-chenyw
ebf36f8464 fix(视图): echarts外边距设置 2022-09-27 14:38:52 +08:00
wangjiahao
7f24ee745c refactor: 修改数据库获取子级和父级函数,防止因垃圾数据出现环路导致循环情况 2022-09-27 14:21:46 +08:00
王嘉豪
4b8b1aaf5d
Merge pull request #3197 from dataease/pr@dev@fix_display_i18n
fix(外观配置): 首页链接格式错误提示国际化
2022-09-27 14:07:03 +08:00
王嘉豪
cf0d947e50
Merge pull request #3198 from dataease/pr@dev@fix_login_limit_clear
fix(登录): 登录成功后登录失败次数未清零
2022-09-27 14:06:34 +08:00
王嘉豪
d7c85b81d2
Merge pull request #3199 from dataease/pr@dev@fix_login_limit_tips
fix(登录): 登录限制提示优化
2022-09-27 14:05:32 +08:00
wangjiahao
92d8fe84e6 refactor: 修改数据库获取子级和父级函数,防止因垃圾数据出现环路导致循环情况 2022-09-27 14:03:40 +08:00
fit2cloud-chenyw
ff5291c5b1 fix(登录): 登录限制提示优化 2022-09-27 13:35:09 +08:00
fit2cloud-chenyw
2ad9c9ca8a fix(登录): 登录成功后登录失败次数未清零 2022-09-27 12:52:08 +08:00
fit2cloud-chenyw
d64ecf8bc5 fix(外观配置): 首页链接格式错误提示国际化 2022-09-27 11:31:40 +08:00
xuwei-fit2cloud
2c42e436b8
Merge pull request #3191 from dataease/pr@dev@excel
Pr@dev@excel
2022-09-27 10:20:48 +08:00
taojinlong
a900d71849 refactor: 代码格式调整 2022-09-27 10:17:52 +08:00
xuwei-fit2cloud
9cf27bec99
Merge pull request #3192 from dataease/pr@dev@fix_user_bind
fix(个人信息): 绑定二维码无法显示
2022-09-27 09:52:49 +08:00
xuwei-fit2cloud
e089a38cd9
Merge pull request #3193 from dataease/pr@dev@fix_ldap_empty_email
fix(ldap): ldap用户邮箱为空无法登录DE
2022-09-27 09:48:01 +08:00
fit2cloud-chenyw
567bbe1f5a fix(ldap): ldap用户邮箱为空无法登录DE 2022-09-26 21:48:02 +08:00
fit2cloud-chenyw
ad07f3d113 fix(个人信息): 绑定二维码无法显示 2022-09-26 21:28:56 +08:00
xuwei-fit2cloud
553584b6e5
Merge pull request #3190 from dataease/pr@dev@perf_user_bind_auth
perf(个人信息): 扫码绑定第三方平台
2022-09-26 17:49:54 +08:00
taojinlong
3b29694684 fix(数据集): TIME 类型,拼接前缀 2022-09-26 17:47:57 +08:00
taojinlong
87d7b56a8e refactor: 整理国际化 2022-09-26 17:47:32 +08:00
fit2cloud-chenyw
4ec767ab95 perf(个人信息): 扫码绑定第三方平台 2022-09-26 17:38:01 +08:00
王嘉豪
da2e634376
Merge pull request #3189 from dataease/pr@dev@excel
fix(数据集): 更新excel 数据不需要校验数据集名称
2022-09-26 17:34:21 +08:00
xuwei-fit2cloud
7f8333edea
Merge pull request #3188 from dataease/pr@dev@fix_view-style-revert
fix(仪表板): 表格颜色样设置跟随仪表板主题变化后,设置视图属性后又恢复的问题
2022-09-26 17:23:37 +08:00
wangjiahao
dc3ac270ef fix(仪表板): 表格颜色样设置跟随仪表板主题变化后,设置视图属性后又恢复的问题 2022-09-26 17:20:10 +08:00
taojinlong
a843a01b77 fix(数据集): 更新excel 数据不需要校验数据集名称 2022-09-26 17:11:11 +08:00
taojinlong
044471c3ac Merge branch 'dev' of github.com:dataease/dataease into dev 2022-09-26 17:09:56 +08:00
taojinlong
53173bc739 refactor(数据源): 更新数据源图标 2022-09-26 17:09:40 +08:00
xuwei-fit2cloud
eec95afd0f
Merge pull request #3177 from dataease/pr@dev@fix_login_limit_form_limit
fix(系统管理-系统参数): 登录限制表单验证允许1-100正整数
2022-09-26 17:03:10 +08:00
fit2cloud-chenyw
5b19ed90c4
Update en.js
fix(国际化): range拼写错误
2022-09-26 17:01:48 +08:00
Junjun
ff5f8eb08c
Merge pull request #3186 from dataease/pr@dev@refactor_component-drage
refactor: 优化仪表板组件拖拽判断,防止出现控制台异常打印
2022-09-26 17:00:30 +08:00
Junjun
1322dd9ab7
Merge pull request #3185 from dataease/pr@dev@fix_rich-text-delete
fix(仪表板): 修复富文本视图部分情况下字段要删两次的情况
2022-09-26 17:00:04 +08:00
王嘉豪
501ec93ebf
Merge pull request #3187 from dataease/pr@dev_dataset_source
Pr@dev dataset source
2022-09-26 16:42:20 +08:00
dataeaseShu
f0ea548a03 Merge branch 'dev' into pr@dev_dataset_source 2022-09-26 16:36:40 +08:00
dataeaseShu
25a113b69b fix: 更新sql数据集数据参考中统计表和字段为0 数据集进入更新页面后回退定位 修复 2022-09-26 16:36:06 +08:00
taojinlong
82c0ce9a10 refactor(数据源): 更新数据源图标 2022-09-26 16:20:31 +08:00
wangjiahao
3dae4b9868 refactor: 优化仪表板组件拖拽判断,防止出现控制台异常打印 2022-09-26 16:14:29 +08:00
wangjiahao
b2f752fde0 fix(仪表板): 修复富文本视图部分情况下字段要删两次的情况 2022-09-26 16:12:47 +08:00
taojinlong
353d20dd3f refactor(数据源): 更新数据源图标 2022-09-26 16:01:38 +08:00
taojinlong
7fbfad2bac Merge branch 'dev' of github.com:dataease/dataease into dev 2022-09-26 16:01:04 +08:00