Commit Graph

551 Commits

Author SHA1 Message Date
taojinlong
f279b673e1 fix: API 数据集名称校验 2022-09-30 11:18:19 +08:00
dataeaseShu
00e43659a2 Merge branch 'dev' into pr@dev_dataset_source 2022-09-29 16:50:52 +08:00
dataeaseShu
1df2a60691 fix: db api数据集不可选图标更换 数据源滚动条去除 2022-09-29 16:49:58 +08:00
taojinlong
6c6b7d0504 fix: 国际化 2022-09-29 15:06:12 +08:00
dataeaseShu
15fb1516c8 Merge branch 'dev' into pr@dev_dataset_source 2022-09-29 14:15:43 +08:00
dataeaseShu
8349fccf43 fix: 数据源布局,编辑驱动bug 修复 2022-09-29 14:14:40 +08:00
xuwei-fit2cloud
72a9e12c55
Merge pull request #3241 from dataease/pr@dev@dataset
Pr@dev@dataset
2022-09-28 17:55:28 +08:00
taojinlong
c752f9c889 fix: 校验数据源时间间隔 2022-09-28 17:50:35 +08:00
dataeaseShu
557b59f550 fix: 任务管理数据集更改 及联组件添加icon 2022-09-28 17:43:51 +08:00
dataeaseShu
3fbfc1bdce Merge branch 'dev' into pr@dev_dataset_source 2022-09-28 16:42:01 +08:00
dataeaseShu
d902c7807d fix: 数据源 数据集 bugfix 2022-09-28 16:41:20 +08:00
taojinlong
d9462d4643 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-09-28 16:20:38 +08:00
taojinlong
c02ff7e1e6 fix: API 数据集预览 2022-09-28 16:20:29 +08:00
taojinlong
83c296b3f0
Merge branch 'dev' into pr@dev@dataset 2022-09-28 16:19:00 +08:00
taojinlong
14f206493a refactor: nikeName -> nickName 2022-09-28 15:45:36 +08:00
xuwei-fit2cloud
81beaaccbd
Merge pull request #3232 from dataease/pr@dev@fix_user_bind_error
fix(个人信息): 扫码绑定第三方平台错误信息提示
2022-09-28 15:09:15 +08:00
taojinlong
bf118ffb7a fix: 系统参数页面调整间隔 2022-09-28 14:47:36 +08:00
fit2cloud-chenyw
94bfe751ad fix(个人信息): 扫码绑定第三方平台错误信息提示 2022-09-28 14:44:31 +08:00
taojinlong
3255cfb449 fix: API 数据集字段类型展示 2022-09-28 13:36:27 +08:00
dataeaseShu
c6cbc5c666 Merge branch 'dev' into pr@dev_dataset_source 2022-09-28 13:05:24 +08:00
dataeaseShu
be33456b17 fix: 数据集 数据源bugfix 2022-09-28 13:04:06 +08:00
fit2cloud-chenyw
a107d1d432 perf(用户管理): 删除第三方平台信息 2022-09-27 18:24:44 +08:00
taojinlong
5b2af3bba3
Merge branch 'dev' into pr@dev_dataset_source 2022-09-27 18:16:24 +08:00
dataeaseShu
e5f4656a91 Merge branch 'dev' into pr@dev_dataset_source 2022-09-27 17:47:54 +08:00
dataeaseShu
5f026e7533 fix: 数据源 数据集 bug修复 2022-09-27 17:46:51 +08:00
taojinlong
106958327e fix(API数据源): 没有子项的字段置灰 2022-09-27 17:25:31 +08:00
taojinlong
888ca2307b fix(API数据源): 请求体没有更新 #3067 2022-09-27 17:25:28 +08:00
fit2cloud-chenyw
31dc2e48e8 fix(登录限制): 限制登录次数填写保存后再次编辑出现验证逻辑错误 2022-09-27 17:12:04 +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
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
87d7b56a8e refactor: 整理国际化 2022-09-26 17:47:32 +08:00
fit2cloud-chenyw
4ec767ab95 perf(个人信息): 扫码绑定第三方平台 2022-09-26 17:38:01 +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
taojinlong
1e3d51840a feat(数据源): 增加数据源图标 2022-09-26 15:10:31 +08:00
wangjiahao
76fd018286 fix: 个人信息修改界面角色改为非必填 2022-09-26 14:14:45 +08:00
fit2cloud-chenyw
896a89b813 fix(系统管理-系统参数): 登录限制表单验证允许1-100正整数 2022-09-26 10:41:39 +08:00
dataeaseShu
e39dd4fe8a fix: 字段管理国际化 2022-09-23 17:49:28 +08:00
xuwei-fit2cloud
8717f51cf3
Merge pull request #3161 from dataease/pr@dev_dataset_source
Pr@dev dataset source
2022-09-23 13:08:59 +08:00
xuwei-fit2cloud
a503fe1937
Merge pull request #3162 from dataease/pr@dev@refactor-system-setting
refactor(系统配置): 系统配置菜单拆分
2022-09-23 13:06:23 +08:00
wangjiahao
ea17177c08 refactor(系统配置): 系统配置菜单拆分 2022-09-23 12:46:39 +08:00
dataeaseShu
ffc8271611 fix: 数据集创建 返回对应的数据集 数据源bug 路由切换bug 2022-09-23 11:17:18 +08:00
dataeaseShu
f7f8f0ab1b fix: 数据源类型 布局 2022-09-22 16:21:07 +08:00
dataeaseShu
d90a49716c fix: 插件国际化 表格记忆select 2022-09-22 14:57:38 +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
王嘉豪
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
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